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 bookworm to v1 Proxy #2271

Merged
merged 4 commits into from
Jul 16, 2024
Merged

feat: add support for bookworm to v1 Proxy #2271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
226dde2
fix: add support for bookworm to v1 Proxy
jackwotherspoon Jul 16, 2024
336726a
chore: Update README.md
jackwotherspoon Jul 16, 2024
6a1ab7a
chore: update filename
jackwotherspoon Jul 16, 2024
df59bb3
chore: Update README.md
jackwotherspoon Jul 16, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile.buster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ ARG TARGETARCH

RUN go get ./...
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
go build -ldflags "-X main.metadataString=container.buster" -o cloud_sql_proxy ./cmd/cloud_sql_proxy
go build -ldflags "-X main.metadataString=container.bookworm" -o cloud_sql_proxy ./cmd/cloud_sql_proxy

# Final stage
FROM gcr.io/cloud-marketplace-containers/google/debian10
FROM gcr.io/cloud-marketplace-containers/google/debian12
RUN apt-get update && apt-get install -y ca-certificates
# Install fuse and allow enable non-root users to mount
RUN apt-get update && apt-get install -y fuse && sed -i 's/^#user_allow_other$/user_allow_other/g' /etc/fuse.conf
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ currently supported:
* `$VERSION` - default image (recommended)
* `$VERSION-alpine` - uses [`alpine:3`](https://hub.docker.com/_/alpine)
as a base image (only supported from v1.17 up)
* `$VERSION-buster` - uses [`debian:buster`](https://hub.docker.com/_/debian)
as a base image (only supported from v1.17 up)
* `$VERSION-bullseye` - uses [`debian:bullseye`](https://hub.docker.com/_/debian)
as a base image (only supported from v1.17 up)
* `$VERSION-bookworm` - uses [`debian:bookworm`](https://hub.docker.com/_/debian)
as a base image (only supported from v1.35.5 and up)

We recommend using the latest version of the proxy and updating the version
regularly. However, we also recommend pinning to a specific tag and avoid the
Expand All @@ -58,7 +58,8 @@ it's a best practice to test changes before deployment, and use automated
rollbacks to revert potential failures.

**NOTE**: As of v1.16, the default container image uses [distroless][]. If you
require a shell or similar tools, use the Alpine or Buster images listed above.
require a shell or similar tools, use the Alpine or Debian based (bullseye
and bookworm) images listed above.

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

Expand Down
Loading