From 16320c73f1e24c48b7b753cc70f96535d3182ffc Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 10 Dec 2021 12:24:34 +0100
Subject: [PATCH 1/2] build: update Go to 1.16.12

Signed-off-by: Hidde Beydals <hello@hidde.co>
---
 .github/actions/run-tests/Dockerfile | 2 +-
 Dockerfile                           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
index ee9bd04eb..d8af3ab53 100644
--- a/.github/actions/run-tests/Dockerfile
+++ b/.github/actions/run-tests/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.16.12
 ARG XX_VERSION=1.0.0-rc.2
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
diff --git a/Dockerfile b/Dockerfile
index 8b818e9c7..34146a44e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.16.12
+ARG GO_LATEST=1.17.5
 ARG XX_VERSION=1.0.0-rc.2
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
@@ -9,7 +10,7 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
-FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
+FROM --platform=$BUILDPLATFORM golang:${GO_LATEST}-${BASE_VARIANT} AS golatest
 
 FROM gostable AS go-linux
 

From dd091a00aec96e433862083ea67e266c12a20418 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 10 Dec 2021 12:25:14 +0100
Subject: [PATCH 2/2] build: update tonistiigi/xx to v1.1.0

https://github.com/tonistiigi/xx/releases/tag/v1.1.0

Signed-off-by: Hidde Beydals <hello@hidde.co>
---
 .github/actions/run-tests/Dockerfile | 2 +-
 Dockerfile                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
index d8af3ab53..5576ed98f 100644
--- a/.github/actions/run-tests/Dockerfile
+++ b/.github/actions/run-tests/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_VARIANT=bullseye
 ARG GO_VERSION=1.16.12
-ARG XX_VERSION=1.0.0-rc.2
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1
diff --git a/Dockerfile b/Dockerfile
index 34146a44e..8cad1e180 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_VARIANT=bullseye
 ARG GO_VERSION=1.16.12
 ARG GO_LATEST=1.17.5
-ARG XX_VERSION=1.0.0-rc.2
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1