Dockerfile: align go version

Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit b854eff) Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Mar 27, 2023 · f381e08 · f381e08
1 parent 18f20a5
commit f381e08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,14 +1,14 @@
 variable "GO_VERSION" {
-    default = "1.19.7"
+    default = null
 }
 variable "VERSION" {
-    default = ""
+    default = null
 }
 variable "USE_GLIBC" {
-    default = ""
+    default = null
 }
 variable "STRIP_TARGET" {
-    default = ""
+    default = null
 }
 variable "IMAGE_NAME" {
     default = "docker-cli"
@@ -52,7 +52,7 @@ target "binary" {
     platforms = ["local"]
     output = ["build"]
     args = {
-        BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
+        BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
         VERSION = VERSION
         PACKAGER_NAME = PACKAGER_NAME
         GO_STRIP = STRIP_TARGET
@@ -72,7 +72,7 @@ target "plugins" {
     platforms = ["local"]
     output = ["build"]
     args = {
-        BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
+        BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
         VERSION = VERSION
         GO_STRIP = STRIP_TARGET
     }
@@ -155,7 +155,7 @@ target "e2e-image" {
     output = ["type=docker"]
     tags = ["${IMAGE_NAME}"]
     args = {
-        BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
+        BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
         VERSION = VERSION
     }
 }

diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.19.4
+ARG GO_VERSION=1.19.7
 ARG ALPINE_VERSION=3.16
 ARG MODOUTDATED_VERSION=v0.8.0