Skip to content

Commit 119dc23

Browse files
hessjcghessjcg
authored
fix: Update dependency versions. (#2520)
1 parent 8bc5285 commit 119dc23

File tree

7 files changed

+116
-111
lines changed

7 files changed

+116
-111
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2626
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container"
2727

2828
# Final Stage
29-
FROM gcr.io/distroless/static:nonroot@sha256:e8a4044e0b4ae4257efa45fc026c0bc30ad320d43bd4c1a7d5271bd241e386d0
29+
FROM gcr.io/distroless/static:nonroot@sha256:cc50b1934f8352245c873c23b06fda77935f99e1f94166f366ee7397141d273c
3030

3131
LABEL org.opencontainers.image.source="https://github.com/GoogleCloudPlatform/cloud-sql-proxy"
3232

‎Dockerfile.alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2626
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container.alpine"
2727

2828
# Final stage
29-
FROM alpine:3@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
29+
FROM alpine:3@sha256:a107a3c031732299dd9dd607bb13787834db2de38cfa13f1993b7105e4814c60
3030

3131
LABEL org.opencontainers.image.source="https://github.com/GoogleCloudPlatform/cloud-sql-proxy"
3232

‎Dockerfile.bookworm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2626
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container.bookworm"
2727

2828
# Final stage
29-
FROM gcr.io/cloud-marketplace-containers/google/debian12@sha256:93c772497eae113717fd179ce3ccafaa7bcacb22fcca95ebc708245bdea5be5a
29+
FROM gcr.io/cloud-marketplace-containers/google/debian12@sha256:faa2c7dcd916d5aecff5ef2de5e4361858a6a2f13f27655e3d93d2642e67af8e
3030

3131
LABEL org.opencontainers.image.source="https://github.com/GoogleCloudPlatform/cloud-sql-proxy"
3232

‎Dockerfile.bullseye‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2626
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container.bullseye"
2727

2828
# Final stage
29-
FROM gcr.io/cloud-marketplace-containers/google/debian11@sha256:73c77188fb99d5606202186172825fd67c4a074fa706ce91bba0d9be801319e1
29+
FROM gcr.io/cloud-marketplace-containers/google/debian11@sha256:ddc82a5ea42dcd8ba25bad2d36a116292d4f73d3fe092dc2a3f853a23163378e
3030

3131
LABEL org.opencontainers.image.source="https://github.com/GoogleCloudPlatform/cloud-sql-proxy"
3232

‎build.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,10 @@ function dockerfile_from_deps() {
168168
else
169169
echo "Updating docker image to $file to $digest"
170170
set -x
171-
sed -ibak -e "s/$oldDigest/$digest/g" "$file"
171+
sed -i.bak -e "s/$oldDigest/$digest/g" "$file"
172+
fi
173+
if [[ -f "$file.bak" ]] ; then
174+
rm "$file.bak"
172175
fi
173176

174177
}

‎go.mod‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ module github.com/GoogleCloudPlatform/cloud-sql-proxy/v2
33
go 1.24.0
44

55
require (
6-
cloud.google.com/go/cloudsqlconn v1.19.0
6+
cloud.google.com/go/cloudsqlconn v1.19.1
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/coreos/go-systemd/v22 v22.6.0
1010
github.com/go-sql-driver/mysql v1.9.3
1111
github.com/google/go-cmp v0.7.0
1212
github.com/hanwen/go-fuse/v2 v2.9.0
1313
github.com/jackc/pgx/v5 v5.7.6
14-
github.com/microsoft/go-mssqldb v1.9.3
15-
github.com/spf13/cobra v1.10.1
14+
github.com/microsoft/go-mssqldb v1.9.5
15+
github.com/spf13/cobra v1.10.2
1616
github.com/spf13/pflag v1.0.10
1717
github.com/spf13/viper v1.21.0
1818
go.opencensus.io v0.24.0
19-
golang.org/x/oauth2 v0.32.0
20-
golang.org/x/sys v0.37.0
21-
google.golang.org/api v0.254.0
19+
golang.org/x/oauth2 v0.34.0
20+
golang.org/x/sys v0.39.0
21+
google.golang.org/api v0.257.0
2222
gopkg.in/natefinch/lumberjack.v2 v2.2.1
2323
)
2424

2525
require (
2626
cloud.google.com/go/auth v0.17.0 // indirect
2727
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2828
cloud.google.com/go/compute/metadata v0.9.0 // indirect
29-
cloud.google.com/go/monitoring v1.24.2 // indirect
30-
cloud.google.com/go/trace v1.11.6 // indirect
29+
cloud.google.com/go/monitoring v1.24.3 // indirect
30+
cloud.google.com/go/trace v1.11.7 // indirect
3131
filippo.io/edwards25519 v1.1.0 // indirect
3232
github.com/aws/aws-sdk-go v1.55.8 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
@@ -45,7 +45,7 @@ require (
4545
github.com/golang/protobuf v1.5.4 // indirect
4646
github.com/google/s2a-go v0.1.9 // indirect
4747
github.com/google/uuid v1.6.0 // indirect
48-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
48+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
4949
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
5050
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5151
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -54,35 +54,35 @@ require (
5454
github.com/jmespath/go-jmespath v0.4.0 // indirect
5555
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5656
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
57-
github.com/prometheus/client_golang v1.23.0 // indirect
57+
github.com/prometheus/client_golang v1.23.2 // indirect
5858
github.com/prometheus/client_model v0.6.2 // indirect
59-
github.com/prometheus/common v0.65.0 // indirect
60-
github.com/prometheus/procfs v0.17.0 // indirect
61-
github.com/prometheus/prometheus v0.305.0 // indirect
59+
github.com/prometheus/common v0.67.4 // indirect
60+
github.com/prometheus/procfs v0.19.2 // indirect
61+
github.com/prometheus/prometheus v0.308.0 // indirect
6262
github.com/prometheus/statsd_exporter v0.28.0 // indirect
6363
github.com/russross/blackfriday/v2 v2.1.0 // indirect
64-
github.com/sagikazarmark/locafero v0.11.0 // indirect
65-
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
64+
github.com/sagikazarmark/locafero v0.12.0 // indirect
65+
github.com/shopspring/decimal v1.4.0 // indirect
6666
github.com/spf13/afero v1.15.0 // indirect
6767
github.com/spf13/cast v1.10.0 // indirect
6868
github.com/subosito/gotenv v1.6.0 // indirect
6969
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
70-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
71-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
72-
go.opentelemetry.io/otel v1.38.0 // indirect
73-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
72+
go.opentelemetry.io/otel v1.39.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
75+
go.yaml.in/yaml/v2 v2.4.3 // indirect
7576
go.yaml.in/yaml/v3 v3.0.4 // indirect
76-
golang.org/x/crypto v0.43.0 // indirect
77-
golang.org/x/net v0.46.0 // indirect
78-
golang.org/x/sync v0.17.0 // indirect
79-
golang.org/x/text v0.30.0 // indirect
77+
golang.org/x/crypto v0.46.0 // indirect
78+
golang.org/x/net v0.48.0 // indirect
79+
golang.org/x/sync v0.19.0 // indirect
80+
golang.org/x/text v0.32.0 // indirect
8081
golang.org/x/time v0.14.0 // indirect
81-
google.golang.org/genproto v0.0.0-20250811160224-6b04f9b4fc78 // indirect
82-
google.golang.org/genproto/googleapis/api v0.0.0-20250811160224-6b04f9b4fc78 // indirect
83-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
84-
google.golang.org/grpc v1.76.0 // indirect
82+
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
83+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
85+
google.golang.org/grpc v1.77.0 // indirect
8586
google.golang.org/protobuf v1.36.10 // indirect
8687
gopkg.in/yaml.v2 v2.4.0 // indirect
87-
gopkg.in/yaml.v3 v3.0.1 // indirect
8888
)

0 commit comments

Comments
 (0)