Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use go1.23 in the build environment of zot container images #2773

Merged
merged 2 commits into from
Nov 10, 2024
Merged

chore: use go1.23 in the build environment of zot container images #2773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8503283
chore: use go1.23 in the build environment of zot container images
andaaron Nov 10, 2024
efa5491
chore: increase timeout in test/blackbox/restore_s3_blobs.bats
andaaron Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-conformance
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-minimal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-zb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-zxp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/stacker-conformance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build/stacker-minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build/stacker-zb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build/stacker-zxp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build/stacker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox/restore_s3_blobs.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
Loading