Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for Debian bookworm #2267

Merged
merged 1 commit into from
Jul 15, 2024
Merged

feat: add support for Debian bookworm #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.buster → Dockerfile.bookworm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Google LLC
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -23,10 +23,10 @@ ARG TARGETARCH

RUN go get ./...
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container.buster"
go build -ldflags "-X github.com/GoogleCloudPlatform/cloud-sql-proxy/v2/cmd.metadataString=container.bookworm"

# Final stage
FROM gcr.io/cloud-marketplace-containers/google/debian10@sha256:bf5274d185680301f076431113bb7f7e21c7748dec0e066166d4bd02a8ff1c09
FROM gcr.io/cloud-marketplace-containers/google/debian12@sha256:9df4cf8df3a3466796d76692ddda1fdcbe5018a2810d332c9a99e2ee2325b6cf

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

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ currently supported:

- `$VERSION` (default)
- `$VERSION-alpine`
- `$VERSION-buster`
- `$VERSION-bookworm`
- `$VERSION-bullseye`

<!-- {x-release-please-start-version} -->
Expand All @@ -423,7 +423,7 @@ We recommend pinning to a specific version tag and using automation with a CI pi
to update regularly.

The default container image uses [distroless][] with a non-root user. If you
need a shell or related tools, use the Alpine or Buster images listed above.
need a shell or related tools, use the Alpine or Bookworm images listed above.
jackwotherspoon marked this conversation as resolved.
Show resolved Hide resolved

[distroless]: https://github.com/GoogleContainerTools/distroless

Expand Down
Loading