chore: use go1.23 in the build environment of zot container images (p…

…roject-zot#2773) * chore: use go1.23 in the build environment of zot container images Signed-off-by: Andrei Aaron <[email protected]> * 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 <[email protected]> --------- Signed-off-by: Andrei Aaron <[email protected]>
andaaron · Nov 10, 2024 · dc38113 · dc38113
1 parent c991491
commit dc38113
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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`