From 7ecfa2e7fd5b4fcd9b293478653ed41a6ea2dcb6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 14 Jun 2023 20:57:02 +0200 Subject: [PATCH 1/2] Dockerfile: update gotestsum to v1.10.0 full diff: https://github.com/gotestyourself/gotestsum/compare/v1.8.2...v1.10.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 9c2694d2b08b53224419d69cd341ca8ec3011089) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- dockerfiles/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbd2052f64dc..4c3b6fa374e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG GO_VERSION=1.20.5 ARG ALPINE_VERSION=3.17 ARG XX_VERSION=1.1.1 ARG GOVERSIONINFO_VERSION=v1.3.0 -ARG GOTESTSUM_VERSION=v1.8.2 +ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.10.4 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index ed5dbec30c2d..e9c8eb1e236d 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ && gofumpt --version FROM golang AS gotestsum -ARG GOTESTSUM_VERSION=v1.8.2 +ARG GOTESTSUM_VERSION=v1.10.0 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ --mount=type=tmpfs,target=/go/src/ \ From 44eebb8bc1378427d8ed37613e825a6538e7cb39 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 20 Jun 2023 12:37:47 +0200 Subject: [PATCH 2/2] Dockerfile: update buildx to v0.11.0 Update the version of buildx we use in the dev-container to v0.11.0; https://github.com/docker/buildx/releases/tag/v0.11.0 Full diff: https://github.com/docker/buildx/compare/v0.10.4..v0.11.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit bf5d1ce973510943c452126bca265a23219071fb) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- dockerfiles/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c3b6fa374e9..e5abb9a34198 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG ALPINE_VERSION=3.17 ARG XX_VERSION=1.1.1 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 -ARG BUILDX_VERSION=0.10.4 +ARG BUILDX_VERSION=0.11.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index e9c8eb1e236d..e53aab1e7fa6 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -3,7 +3,7 @@ ARG GO_VERSION=1.20.5 ARG ALPINE_VERSION=3.17 -ARG BUILDX_VERSION=0.10.4 +ARG BUILDX_VERSION=0.11.0 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang