From f381e08425dcc232e9e548d3ff2df243e3324565 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 24 Mar 2023 21:06:20 +0100
Subject: [PATCH] Dockerfile: align go version

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit b854eff3004eb12c83333a1b1479cb89ed028387)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 docker-bake.hcl               | 14 +++++++-------
 dockerfiles/Dockerfile.vendor |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 4ffa08bb3a81..1efac9464c45 100644
--- 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
index 618ae1479d49..300c896dda42 100644
--- 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