Skip to content

Commit 0202e32

Browse files
fredrfredr
authored
Update go-containerregistry (#2152)
To support newer versions of docker (https://www.docker.com/blog/docker-engine-version-29/) Should fix #2143
1 parent daa09b6 commit 0202e32

File tree

4 files changed

+113
-87
lines changed

4 files changed

+113
-87
lines changed

‎cli/daemon/run.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ func (s *Server) Run(req *daemonpb.RunRequest, stream daemonpb.Daemon_RunServer)
104104

105105
// If force upgrade has been enabled, we force the upgrade now before we try and run the app
106106
if newVer != nil && newVer.ForceUpgrade {
107-
_, _ = fmt.Fprintf(stderr, aurora.Red("An urgent security update for Encore is available.").String()+"\n")
107+
_, _ = fmt.Fprint(stderr, aurora.Red("An urgent security update for Encore is available.").String()+"\n")
108108
if newVer.SecurityNotes != "" {
109-
_, _ = fmt.Fprintf(stderr, aurora.Sprintf(aurora.Yellow("%s"), newVer.SecurityNotes)+"\n")
109+
_, _ = fmt.Fprint(stderr, aurora.Sprintf(aurora.Yellow("%s"), newVer.SecurityNotes)+"\n")
110110
}
111111

112112
_, _ = fmt.Fprintf(stderr, "Upgrading Encore to %v...\n", newVer.Version())
113113
if err := newVer.DoUpgrade(stderr, stderr); err != nil {
114-
_, _ = fmt.Fprintf(stderr, aurora.Sprintf(aurora.Red("Upgrade failed: %v"), err)+"\n")
114+
_, _ = fmt.Fprint(stderr, aurora.Sprintf(aurora.Red("Upgrade failed: %v"), err)+"\n")
115115
}
116116

117117
slog.FlushBuffers()

‎go.mod‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module encr.dev
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.23.3
5+
toolchain go1.24.9
66

77
require (
88
cloud.google.com/go/storage v1.43.0
@@ -19,7 +19,6 @@ require (
1919
github.com/charmbracelet/bubbletea v0.24.2
2020
github.com/charmbracelet/lipgloss v0.7.1
2121
github.com/cockroachdb/errors v1.11.1
22-
github.com/containerd/stargz-snapshotter/estargz v0.14.3
2322
github.com/dave/jennifer v1.7.0
2423
github.com/evanw/esbuild v0.19.8
2524
github.com/fatih/color v1.15.0
@@ -33,7 +32,7 @@ require (
3332
github.com/golang/protobuf v1.5.4
3433
github.com/google/btree v1.1.3
3534
github.com/google/go-cmp v0.7.0
36-
github.com/google/go-containerregistry v0.20.2
35+
github.com/google/go-containerregistry v0.20.6
3736
github.com/google/renameio/v2 v2.0.0
3837
github.com/gorilla/mux v1.8.1
3938
github.com/gorilla/websocket v1.5.0
@@ -73,16 +72,16 @@ require (
7372
go.encore.dev/platform-sdk v1.1.0
7473
go.uber.org/goleak v1.3.0
7574
go4.org v0.0.0-20230225012048-214862532bf5
76-
golang.org/x/crypto v0.36.0
75+
golang.org/x/crypto v0.39.0
7776
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
78-
golang.org/x/mod v0.24.0
79-
golang.org/x/net v0.38.0
80-
golang.org/x/oauth2 v0.25.0
81-
golang.org/x/sync v0.13.0
82-
golang.org/x/sys v0.31.0
83-
golang.org/x/term v0.30.0
84-
golang.org/x/text v0.23.0
85-
golang.org/x/tools v0.31.0
77+
golang.org/x/mod v0.25.0
78+
golang.org/x/net v0.41.0
79+
golang.org/x/oauth2 v0.30.0
80+
golang.org/x/sync v0.15.0
81+
golang.org/x/sys v0.33.0
82+
golang.org/x/term v0.32.0
83+
golang.org/x/text v0.26.0
84+
golang.org/x/tools v0.34.0
8685
google.golang.org/api v0.200.0
8786
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f
8887
google.golang.org/grpc v1.71.1
@@ -94,6 +93,12 @@ require (
9493
require (
9594
cel.dev/expr v0.19.1 // indirect
9695
filippo.io/edwards25519 v1.1.0 // indirect
96+
github.com/containerd/errdefs v1.0.0 // indirect
97+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
98+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
99+
github.com/distribution/reference v0.6.0 // indirect
100+
github.com/moby/docker-image-spec v1.3.1 // indirect
101+
github.com/moby/sys/sequential v0.6.0 // indirect
97102
github.com/ncruces/go-strftime v0.1.9 // indirect
98103
github.com/pganalyze/pg_query_go/v6 v6.1.0 // indirect
99104
github.com/spf13/cast v1.7.1 // indirect
@@ -106,10 +111,10 @@ require (
106111
cloud.google.com/go v0.115.1 // indirect
107112
cloud.google.com/go/auth v0.9.8 // indirect
108113
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
109-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
114+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
110115
cloud.google.com/go/iam v1.2.1 // indirect
111116
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
112-
github.com/Microsoft/go-winio v0.6.1 // indirect
117+
github.com/Microsoft/go-winio v0.6.2 // indirect
113118
github.com/algolia/algoliasearch-client-go/v3 v3.31.4
114119
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
115120
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -127,17 +132,17 @@ require (
127132
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
128133
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
129134
github.com/dlclark/regexp2 v1.7.0 // indirect
130-
github.com/docker/cli v27.1.1+incompatible // indirect
131-
github.com/docker/distribution v2.8.2+incompatible // indirect
132-
github.com/docker/docker v24.0.7+incompatible // indirect
133-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
134-
github.com/docker/go-connections v0.4.0 // indirect
135+
github.com/docker/cli v28.2.2+incompatible // indirect
136+
github.com/docker/distribution v2.8.3+incompatible // indirect
137+
github.com/docker/docker v28.2.2+incompatible // indirect
138+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
139+
github.com/docker/go-connections v0.5.0 // indirect
135140
github.com/docker/go-units v0.5.0 // indirect
136141
github.com/dustin/go-humanize v1.0.1 // indirect
137142
github.com/emicklei/proto v1.9.2 // indirect
138143
github.com/felixge/httpsnoop v1.0.4 // indirect
139144
github.com/getsentry/sentry-go v0.25.0 // indirect
140-
github.com/go-logr/logr v1.4.2 // indirect
145+
github.com/go-logr/logr v1.4.3 // indirect
141146
github.com/go-logr/stdr v1.2.2 // indirect
142147
github.com/go-openapi/jsonpointer v0.20.0 // indirect
143148
github.com/go-openapi/swag v0.22.4 // indirect
@@ -163,7 +168,7 @@ require (
163168
github.com/jackc/puddle/v2 v2.2.2 // indirect
164169
github.com/jinzhu/inflection v1.0.0 // indirect
165170
github.com/josharian/intern v1.0.0 // indirect
166-
github.com/klauspost/compress v1.17.2 // indirect
171+
github.com/klauspost/compress v1.18.0 // indirect
167172
github.com/knadh/koanf/maps v0.1.1 // indirect
168173
github.com/kr/pretty v0.3.1 // indirect
169174
github.com/kr/text v0.2.0 // indirect
@@ -187,7 +192,7 @@ require (
187192
github.com/muesli/termenv v0.15.2 // indirect
188193
github.com/nsqio/go-diskqueue v1.1.0 // indirect
189194
github.com/opencontainers/go-digest v1.0.0 // indirect
190-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
195+
github.com/opencontainers/image-spec v1.1.1 // indirect
191196
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
192197
github.com/perimeterx/marshmallow v1.1.4 // indirect
193198
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
@@ -203,15 +208,15 @@ require (
203208
github.com/sirupsen/logrus v1.9.3 // indirect
204209
github.com/stoewer/go-strcase v1.2.0 // indirect
205210
github.com/tetratelabs/wazero v1.9.0 // indirect
206-
github.com/vbatts/tar-split v0.11.5 // indirect
211+
github.com/vbatts/tar-split v0.12.1 // indirect
207212
github.com/wasilibs/go-pgquery v0.0.0-20250409022910-10ac41983c07 // indirect
208213
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
209214
go.opencensus.io v0.24.0 // indirect
210215
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
211-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
212-
go.opentelemetry.io/otel v1.34.0 // indirect
213-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
214-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
216+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
217+
go.opentelemetry.io/otel v1.36.0 // indirect
218+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
219+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
215220
go.uber.org/atomic v1.11.0 // indirect
216221
go.uber.org/multierr v1.11.0 // indirect
217222
go.uber.org/zap v1.27.0 // indirect

0 commit comments

Comments
 (0)