From fbec17bd2c8c0898bdf41eb22669a871e5048ba9 Mon Sep 17 00:00:00 2001 From: Jack Wotherspoon Date: Mon, 15 Jul 2024 09:18:24 -0400 Subject: [PATCH] feat: add support for Debian bookworm (#2267) Add support for Debian 12 "bookworm" and remove support for Debian 10 "buster" as its LTS ended on June 30. --- Dockerfile.buster => Dockerfile.bookworm | 6 +++--- README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename Dockerfile.buster => Dockerfile.bookworm (88%) diff --git a/Dockerfile.buster b/Dockerfile.bookworm similarity index 88% rename from Dockerfile.buster rename to Dockerfile.bookworm index 24100c09a..f2588db69 100644 --- a/Dockerfile.buster +++ b/Dockerfile.bookworm @@ -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. @@ -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" diff --git a/README.md b/README.md index a99e21cfe..68928b196 100644 --- a/README.md +++ b/README.md @@ -404,7 +404,7 @@ currently supported: - `$VERSION` (default) - `$VERSION-alpine` -- `$VERSION-buster` +- `$VERSION-bookworm` - `$VERSION-bullseye` @@ -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. [distroless]: https://github.com/GoogleContainerTools/distroless