Merge pull request #4440 from thaJeztah/20.10_update_go_1.19.11

[20.10] update go to go1.19.11, debian buster
docker · Jul 20, 2023 · 51c3245 · 51c3245
2 parents 4b0940b + 9b21793
commit 51c3245
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG BASE_VARIANT=alpine
-ARG GO_VERSION=1.19.10
+ARG GO_VERSION=1.19.11
 ARG ALPINE_VERSION=3.17
 ARG XX_VERSION=1.1.0
 
@@ -17,12 +17,12 @@ ARG TARGETPLATFORM
 # gcc is installed for libgcc only
 RUN xx-apk add --no-cache musl-dev gcc
 
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
 COPY --from=xx / /
 RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
 WORKDIR /go/src/github.com/docker/cli
 
-FROM build-base-buster AS build-buster
+FROM build-base-bullseye AS build-bullseye
 ARG TARGETPLATFORM
 RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.19.10
+  GOVERSION: 1.19.11
   DEPVERSION: v0.4.1
 
 install:

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.19.10"
+    default = "1.19.11"
 }
 variable "VERSION" {
     default = ""
@@ -22,7 +22,7 @@ target "binary" {
     platforms = ["local"]
     output = ["build"]
     args = {
-        BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine"
+        BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
         VERSION = VERSION
         GO_STRIP = STRIP_TARGET
     }

diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.19.10
+ARG GO_VERSION=1.19.11
 
 FROM    golang:${GO_VERSION}-alpine
 

diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.10
+ARG GO_VERSION=1.19.11
 ARG ALPINE_VERSION=3.17
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang

diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
@@ -1,7 +1,7 @@
-ARG GO_VERSION=1.19.10
+ARG GO_VERSION=1.19.11
 
 # Use Debian based image as docker-compose requires glibc.
-FROM golang:${GO_VERSION}-buster
+FROM golang:${GO_VERSION}-bullseye
 
 RUN apt-get update && apt-get install -y \
     build-essential \

diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.10
+ARG GO_VERSION=1.19.11
 ARG ALPINE_VERSION=3.17
 ARG GOLANGCI_LINT_VERSION=v1.49.0