diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3496e7975..b27d91193 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "name": "Go", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1.20-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1.20-bookworm", // Features to add to the dev container. More info: https://containers.dev/features. "features": { diff --git a/.github/workflows/e2e-arm64-template.yaml b/.github/workflows/e2e-arm64-template.yaml index 5f19b4d43..b5144e7fc 100644 --- a/.github/workflows/e2e-arm64-template.yaml +++ b/.github/workflows/e2e-arm64-template.yaml @@ -12,7 +12,7 @@ jobs: # this is to prevent the job to run at forked projects if: github.repository == 'etcd-io/etcd' runs-on: [self-hosted, Linux, ARM64] - container: golang:1.20-bullseye + container: golang:1.20-bookworm defaults: run: shell: bash diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 6add7f406..278c41b48 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -6,7 +6,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: golang:1.20-bullseye + image: golang:1.20-bookworm defaults: run: shell: bash diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml index 36601b7e4..a16e66ff1 100644 --- a/.github/workflows/grpcproxy.yaml +++ b/.github/workflows/grpcproxy.yaml @@ -5,7 +5,7 @@ permissions: read-all jobs: test: runs-on: ubuntu-latest - container: golang:1.20-bullseye + container: golang:1.20-bookworm defaults: run: shell: bash diff --git a/.github/workflows/robustness-template.yaml b/.github/workflows/robustness-template.yaml index e81be9e3c..7190bc80a 100644 --- a/.github/workflows/robustness-template.yaml +++ b/.github/workflows/robustness-template.yaml @@ -27,7 +27,7 @@ jobs: timeout-minutes: 210 runs-on: ${{ fromJson(inputs.runs-on) }} container: - image: golang:1.20-bullseye + image: golang:1.20-bookworm # Required for mounting fuse lazyfs options: --privileged defaults: diff --git a/.github/workflows/tests-arm64-template.yaml b/.github/workflows/tests-arm64-template.yaml index 860419320..3a089dd20 100644 --- a/.github/workflows/tests-arm64-template.yaml +++ b/.github/workflows/tests-arm64-template.yaml @@ -17,7 +17,7 @@ jobs: # this is to prevent the job to run at forked projects if: github.repository == 'etcd-io/etcd' runs-on: [self-hosted, Linux, ARM64] - container: golang:1.20-bullseye + container: golang:1.20-bookworm defaults: run: shell: bash diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index eaf849d83..2e42dc768 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -5,7 +5,7 @@ permissions: read-all jobs: test: runs-on: ubuntu-latest - container: golang:1.20-bullseye + container: golang:1.20-bookworm defaults: run: shell: bash diff --git a/Dockerfile b/Dockerfile index 861a1d5b8..a81191e6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG ARCH=amd64 -FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian11 +FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12 ADD etcd /usr/local/bin/ ADD etcdctl /usr/local/bin/ diff --git a/tests/e2e/cmux_test.go b/tests/e2e/cmux_test.go index 89844093c..3260fd826 100644 --- a/tests/e2e/cmux_test.go +++ b/tests/e2e/cmux_test.go @@ -121,7 +121,7 @@ func testConnectionMultiplexing(t *testing.T, ctx context.Context, member e2e.Et assert.NoError(t, err) }) t.Run("curl", func(t *testing.T) { - for _, httpVersion := range []string{"2", "1.1", "1.0", ""} { + for _, httpVersion := range []string{"2", "1.1", ""} { tname := "http" + httpVersion if httpVersion == "" { tname = "default"