Skip to content

Commit eae516c

Browse files
silvin-lubeckisilvin-lubecki
committed
Add windows-arm64 cross build
Bump all dependencies Signed-off-by: Silvin Lubecki <[email protected]>
1 parent 44062da commit eae516c

File tree

9 files changed

+525
-1077
lines changed

9 files changed

+525
-1077
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# limitations under the License.
1717

1818

19-
ARG GO_VERSION=1.16.3-alpine
19+
ARG GO_VERSION=1.22.0-alpine3.19
2020
ARG CLI_VERSION=20.10.2
21-
ARG ALPINE_VERSION=3.12.2
21+
ARG ALPINE_VERSION=3.19.0
2222
ARG GOLANGCI_LINT_VERSION=v1.33.0-alpine
2323

2424
####

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ package-cross: cross ## Package the cross compiled binaries in tarballs for *nix
6565
--target package | gzip -9 > dist/$(BINARY_NAME)-$(subst /,-,$(plat)).tar.gz ;)
6666
cp bin/$(BINARY_NAME)_windows_amd64.exe $(TMPDIR_WIN_PKG)/$(BINARY_NAME).exe
6767
rm -f dist/$(BINARY_NAME)-windows-amd64.zip && zip dist/$(BINARY_NAME)-windows-amd64.zip -j packaging/LICENSE $(TMPDIR_WIN_PKG)/$(BINARY_NAME).exe
68+
cp bin/$(BINARY_NAME)_windows_arm64.exe $(TMPDIR_WIN_PKG)/$(BINARY_NAME).exe
69+
rm -f dist/$(BINARY_NAME)-windows-arm64.zip && zip dist/$(BINARY_NAME)-windows-arm64.zip -j packaging/LICENSE $(TMPDIR_WIN_PKG)/$(BINARY_NAME).exe
6870
rm -r $(TMPDIR_WIN_PKG)
6971

7072
.PHONY: install

‎builder.Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ cross:
6363
GOOS=darwin GOARCH=amd64 $(STATIC_FLAGS) $(GO_BUILD) -o bin/$(BINARY_NAME)_darwin_amd64 .
6464
GOOS=darwin GOARCH=arm64 $(STATIC_FLAGS) $(GO_BUILD) -o bin/$(BINARY_NAME)_darwin_arm64 .
6565
GOOS=windows GOARCH=amd64 $(STATIC_FLAGS) $(GO_BUILD) -o bin/$(BINARY_NAME)_windows_amd64.exe .
66+
GOOS=windows GOARCH=arm64 $(STATIC_FLAGS) $(GO_BUILD) -o bin/$(BINARY_NAME)_windows_arm64.exe .
6667

6768
# Note we're building statically for now to simplify releases. We can
6869
# investigate dynamic builds later.

‎go.mod

+86-25
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,98 @@
11
module github.com/docker/hub-tool
22

3-
go 1.15
3+
go 1.21
44

55
require (
6-
github.com/bitly/go-hostpool v0.1.0 // indirect
6+
github.com/cli/cli v1.14.0
7+
github.com/containerd/containerd v1.7.13
8+
github.com/docker/cli v25.0.3+incompatible
9+
github.com/docker/compose-cli v1.0.35
10+
github.com/docker/distribution v2.8.3+incompatible
11+
github.com/docker/docker v25.0.3+incompatible
12+
github.com/docker/go-units v0.5.0
13+
github.com/google/uuid v1.6.0
14+
github.com/mattn/go-isatty v0.0.14
15+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
16+
github.com/moby/term v0.5.0
17+
github.com/opencontainers/image-spec v1.1.0
18+
github.com/pkg/errors v0.9.1
19+
github.com/sirupsen/logrus v1.9.3
20+
github.com/spf13/cobra v1.8.0
21+
github.com/spf13/pflag v1.0.5
22+
golang.org/x/sync v0.6.0
23+
gopkg.in/square/go-jose.v2 v2.6.0
24+
gotest.tools/v3 v3.5.1
25+
)
26+
27+
require (
28+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
29+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
30+
github.com/Microsoft/go-winio v0.6.1 // indirect
31+
github.com/Microsoft/hcsshim v0.11.4 // indirect
32+
github.com/Shopify/logrus-bugsnag v0.0.0-20230117174420-439a4b8ba167 // indirect
33+
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
34+
github.com/beorn7/perks v1.0.1 // indirect
35+
github.com/briandowns/spinner v1.11.1 // indirect
736
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
837
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
9-
github.com/cli/cli v1.1.0
38+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
39+
github.com/cli/safeexec v1.0.0 // indirect
1040
github.com/cloudflare/cfssl v1.4.1 // indirect
11-
github.com/containerd/containerd v1.4.3
12-
github.com/docker/cli v20.10.3+incompatible
13-
github.com/docker/compose-cli v1.0.5-0.20201215113846-10a19b115968
14-
github.com/docker/distribution v2.7.1+incompatible
15-
github.com/docker/docker v20.10.3+incompatible
16-
github.com/docker/docker-credential-helpers v0.6.4-0.20210125172408-38bea2ce277a // indirect
17-
github.com/docker/go-units v0.4.0
41+
github.com/containerd/log v0.1.0 // indirect
42+
github.com/distribution/reference v0.5.0 // indirect
43+
github.com/docker/compose/v2 v2.2.0 // indirect
44+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
45+
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
46+
github.com/docker/go-connections v0.4.0 // indirect
47+
github.com/docker/go-metrics v0.0.1 // indirect
1848
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
49+
github.com/fatih/color v1.9.0 // indirect
50+
github.com/felixge/httpsnoop v1.0.3 // indirect
1951
github.com/fvbommel/sortorder v1.0.2 // indirect
52+
github.com/go-logr/logr v1.2.4 // indirect
53+
github.com/go-logr/stdr v1.2.2 // indirect
54+
github.com/go-sql-driver/mysql v1.5.0 // indirect
2055
github.com/gofrs/uuid v3.3.0+incompatible // indirect
21-
github.com/google/uuid v1.1.2
56+
github.com/gogo/protobuf v1.3.2 // indirect
57+
github.com/golang/protobuf v1.5.3 // indirect
58+
github.com/google/go-cmp v0.5.9 // indirect
59+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
60+
github.com/gorilla/mux v1.8.0 // indirect
61+
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
62+
github.com/hashicorp/go-version v1.6.0 // indirect
63+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2264
github.com/jinzhu/gorm v1.9.16 // indirect
23-
github.com/lib/pq v1.8.0 // indirect
24-
github.com/mattn/go-sqlite3 v1.14.3 // indirect
25-
github.com/miekg/pkcs11 v1.0.3 // indirect
26-
github.com/moby/sys/mount v0.2.0 // indirect
27-
github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf
28-
github.com/opencontainers/image-spec v1.0.1
29-
github.com/pkg/errors v0.9.1
30-
github.com/sirupsen/logrus v1.7.0
31-
github.com/spf13/cobra v1.1.1
32-
github.com/spf13/pflag v1.0.5
33-
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
34-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
35-
gopkg.in/square/go-jose.v2 v2.5.1
36-
gotest.tools/v3 v3.0.3
65+
github.com/klauspost/compress v1.16.0 // indirect
66+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
67+
github.com/mattn/go-colorable v0.1.11 // indirect
68+
github.com/mattn/go-runewidth v0.0.10 // indirect
69+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
70+
github.com/miekg/pkcs11 v1.1.1 // indirect
71+
github.com/moby/locker v1.0.1 // indirect
72+
github.com/moby/sys/sequential v0.5.0 // indirect
73+
github.com/morikuni/aec v1.0.0 // indirect
74+
github.com/muesli/termenv v0.8.1 // indirect
75+
github.com/opencontainers/go-digest v1.0.0 // indirect
76+
github.com/prometheus/client_golang v1.14.0 // indirect
77+
github.com/prometheus/client_model v0.3.0 // indirect
78+
github.com/prometheus/common v0.37.0 // indirect
79+
github.com/prometheus/procfs v0.8.0 // indirect
80+
github.com/rivo/uniseg v0.2.0 // indirect
81+
github.com/theupdateframework/notary v0.6.1 // indirect
82+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
83+
go.opentelemetry.io/otel v1.19.0 // indirect
84+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
86+
golang.org/x/crypto v0.14.0 // indirect
87+
golang.org/x/mod v0.11.0 // indirect
88+
golang.org/x/net v0.17.0 // indirect
89+
golang.org/x/sys v0.13.0 // indirect
90+
golang.org/x/term v0.13.0 // indirect
91+
golang.org/x/tools v0.10.0 // indirect
92+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
93+
google.golang.org/grpc v1.58.3 // indirect
94+
google.golang.org/protobuf v1.31.0 // indirect
95+
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
96+
gopkg.in/fatih/pool.v2 v2.0.0 // indirect
97+
gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
3798
)

0 commit comments

Comments
 (0)