Merge pull request #16516 from SagarRawat24/bookworm

update the debian12 and bookworm remove --v 1.0
This commit is contained in:
Marek Siarkowicz 2023-09-01 20:52:38 +02:00 committed by GitHub
commit e09cc1e82c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions

View File

@ -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": {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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/

View File

@ -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"