From dc38113df0b0cb935bdd97ded28f2233803e63f7 Mon Sep 17 00:00:00 2001 From: Andrei Aaron Date: Sun, 10 Nov 2024 20:36:09 +0200 Subject: [PATCH] chore: use go1.23 in the build environment of zot container images (#2773) * chore: use go1.23 in the build environment of zot container images Signed-off-by: Andrei Aaron * chore: increase timeout in test/blackbox/restore_s3_blobs.bats Looks like the message is actually there even if the test fails, maybe there is a timing issue. https://github.com/project-zot/zot/actions/runs/11747889146/job/32730772641 Signed-off-by: Andrei Aaron --------- Signed-off-by: Andrei Aaron --- build/Dockerfile | 2 +- build/Dockerfile-conformance | 2 +- build/Dockerfile-minimal | 2 +- build/Dockerfile-zb | 2 +- build/Dockerfile-zxp | 2 +- build/stacker-conformance.yaml | 2 +- build/stacker-minimal.yaml | 2 +- build/stacker-zb.yaml | 2 +- build/stacker-zxp.yaml | 2 +- build/stacker.yaml | 2 +- test/blackbox/restore_s3_blobs.bats | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 78a48ee39..7e77e3c1b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance index 6878935cf..efb40175e 100644 --- a/build/Dockerfile-conformance +++ b/build/Dockerfile-conformance @@ -1,7 +1,7 @@ # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal index 789bcca68..2a367f8c1 100644 --- a/build/Dockerfile-minimal +++ b/build/Dockerfile-minimal @@ -1,7 +1,7 @@ # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb index 34ea763e3..80e916e2c 100644 --- a/build/Dockerfile-zb +++ b/build/Dockerfile-zb @@ -1,7 +1,7 @@ # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp index b37db0332..dde0d25bd 100644 --- a/build/Dockerfile-zxp +++ b/build/Dockerfile-zxp @@ -1,7 +1,7 @@ # --- # Stage 1: Build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml index 8beb85696..9e156a7c6 100644 --- a/build/stacker-conformance.yaml +++ b/build/stacker-conformance.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.22 + url: docker://ghcr.io/project-zot/golang:1.23 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml index dd90f3471..64e75b286 100644 --- a/build/stacker-minimal.yaml +++ b/build/stacker-minimal.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.22 + url: docker://ghcr.io/project-zot/golang:1.23 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml index 7db9c6b12..36573ad0a 100644 --- a/build/stacker-zb.yaml +++ b/build/stacker-zb.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.22 + url: docker://ghcr.io/project-zot/golang:1.23 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml index e39dcdb7a..34aaa83fe 100644 --- a/build/stacker-zxp.yaml +++ b/build/stacker-zxp.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.22 + url: docker://ghcr.io/project-zot/golang:1.23 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker.yaml b/build/stacker.yaml index b1028d4a6..12e1a414f 100644 --- a/build/stacker.yaml +++ b/build/stacker.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.22 + url: docker://ghcr.io/project-zot/golang:1.23 binds: - ../. -> /zotcopy run: | diff --git a/test/blackbox/restore_s3_blobs.bats b/test/blackbox/restore_s3_blobs.bats index 557585419..87f7a782e 100644 --- a/test/blackbox/restore_s3_blobs.bats +++ b/test/blackbox/restore_s3_blobs.bats @@ -131,7 +131,7 @@ function teardown_file() { start=`date +%s` echo "waiting for restoring blobs task to finish" >&3 - run wait_for_string "no digests left, finished" ${ZOT_LOG_FILE} "5m" + run wait_for_string "no digests left, finished" ${ZOT_LOG_FILE} "6m" [ "$status" -eq 0 ] end=`date +%s`