diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index bee0b989..80093089 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x # Run benchmark with `go test -bench` and stores the output to a file - name: Run benchmark run: make BENCH_OUTPUT=ci-cd run-bench diff --git a/.github/workflows/branch-cov.yaml b/.github/workflows/branch-cov.yaml index f186dfd0..84733a4e 100644 --- a/.github/workflows/branch-cov.yaml +++ b/.github/workflows/branch-cov.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6c225264..78ca90bc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 diff --git a/.github/workflows/cloc.yaml b/.github/workflows/cloc.yaml index e7f51c4a..bdf7bc54 100644 --- a/.github/workflows/cloc.yaml +++ b/.github/workflows/cloc.yaml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Check out source code uses: actions/checkout@v4 - name: Install dependencies diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml index 61dc8b49..7fab7293 100644 --- a/.github/workflows/cluster.yaml +++ b/.github/workflows/cluster.yaml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d3903e52..70ff4e34 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -49,7 +49,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/compare-binary-size.yaml b/.github/workflows/compare-binary-size.yaml index a6a87ece..b57f3a15 100644 --- a/.github/workflows/compare-binary-size.yaml +++ b/.github/workflows/compare-binary-size.yaml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Checkout zot (main branch) run: | mkdir -p $GITHUB_WORKSPACE/zot_main diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml index 5b9ccd49..89ced4d7 100644 --- a/.github/workflows/ecosystem-tools.yaml +++ b/.github/workflows/ecosystem-tools.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/gc-stress-test.yaml b/.github/workflows/gc-stress-test.yaml index 6371eccf..36fd324e 100644 --- a/.github/workflows/gc-stress-test.yaml +++ b/.github/workflows/gc-stress-test.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Run zb id: bench @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Run zb id: bench @@ -82,7 +82,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - uses: ./.github/actions/setup-localstack - name: Setup minio service run: | @@ -157,7 +157,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - uses: ./.github/actions/setup-localstack - name: Setup minio service run: | diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 477ff06d..421af198 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: '1.21' + go-version: '1.22' - uses: actions/checkout@v4 - name: Run linter with GH action uses: golangci/golangci-lint-action@v4 diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml index e2445894..fa15c437 100644 --- a/.github/workflows/gqlgen.yaml +++ b/.github/workflows/gqlgen.yaml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml index e6460929..47967ba4 100644 --- a/.github/workflows/license.yaml +++ b/.github/workflows/license.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install go-licenses run: go install github.com/google/go-licenses@latest - name: Check for forbidden licenses diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index db863bec..7034af52 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -67,7 +67,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -85,7 +85,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - uses: ./.github/actions/setup-localstack - name: Run zb @@ -122,7 +122,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - uses: ./.github/actions/setup-localstack - name: Run zb @@ -170,7 +170,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/oci-conformance-action.yaml b/.github/workflows/oci-conformance-action.yaml index 9fab66cb..f1e0fd5a 100644 --- a/.github/workflows/oci-conformance-action.yaml +++ b/.github/workflows/oci-conformance-action.yaml @@ -20,11 +20,11 @@ jobs: runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Install go 1.21 + - name: Install go 1.22 uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Checkout this PR uses: actions/checkout@v4 - name: Start zot server diff --git a/.github/workflows/sync-3rdparty-images.yaml b/.github/workflows/sync-3rdparty-images.yaml index 3ac325d0..c2f3b715 100644 --- a/.github/workflows/sync-3rdparty-images.yaml +++ b/.github/workflows/sync-3rdparty-images.yaml @@ -18,7 +18,7 @@ jobs: strategy: matrix: golang_version: - - "1.21" + - "1.22" runs-on: ubuntu-latest steps: - name: Log in to GitHub Docker Registry diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9172278a..da76edf1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -60,7 +60,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -99,7 +99,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -133,7 +133,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: download all workflow coverage files uses: actions/download-artifact@v4 - name: merge code coverage diff --git a/.github/workflows/tls.yaml b/.github/workflows/tls.yaml index 54fa1803..e8521f36 100644 --- a/.github/workflows/tls.yaml +++ b/.github/workflows/tls.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/web-scan.yaml b/.github/workflows/web-scan.yaml index 743f9d3a..af8ef74c 100644 --- a/.github/workflows/web-scan.yaml +++ b/.github/workflows/web-scan.yaml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-go@v5 with: cache: false - go-version: 1.21.x + go-version: 1.22.x - name: Checkout uses: actions/checkout@v4 - name: Build zot diff --git a/Makefile b/Makefile index 4415b2eb..13e89e6e 100644 --- a/Makefile +++ b/Makefile @@ -55,12 +55,11 @@ BENCH_OUTPUT ?= stdout ALL_EXTENSIONS = debug,imagetrust,lint,metrics,mgmt,profile,scrub,search,sync,ui,userprefs EXTENSIONS ?= sync,search,scrub,metrics,lint,ui,mgmt,profile,userprefs,imagetrust UI_DEPENDENCIES := search,mgmt,userprefs -# freebsd/arm64 not supported for pie builds +# freebsd is not supported for pie builds if CGO is disabled +# see supported platforms at https://cs.opensource.google/go/go/+/master:src/internal/platform/supported.go;l=222-231;drc=d7fcb5cf80953f1d63246f1ae9defa60c5ce2d76 BUILDMODE_FLAGS := -buildmode=pie ifeq ($(OS),freebsd) - ifeq ($(ARCH),arm64) - BUILDMODE_FLAGS= - endif + BUILDMODE_FLAGS= endif comma:= , space := $(null) # diff --git a/build/Dockerfile b/build/Dockerfile index 3ad14a98..b5a19bd6 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.21 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance index 71cf7425..6878935c 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.21 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal index f2c477b1..789bcca6 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.21 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb index f8f0d0b8..34ea763e 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.21 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp index 75a39439..b37db033 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.21 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml index d2cf15b5..bc9ae65f 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.21 + url: docker://ghcr.io/project-zot/golang:1.22 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml index c536d33a..bcb1cfd3 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.21 + url: docker://ghcr.io/project-zot/golang:1.22 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml index 951ed72e..cb97dd7f 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.21 + url: docker://ghcr.io/project-zot/golang:1.22 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml index 2b533f68..ffeb4f30 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.21 + url: docker://ghcr.io/project-zot/golang:1.22 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker.yaml b/build/stacker.yaml index f7345791..c989ad75 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.21 + url: docker://ghcr.io/project-zot/golang:1.22 binds: - ../. -> /zotcopy run: | diff --git a/go.mod b/go.mod index d241692f..4d4b3a8b 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module zotregistry.dev/zot go 1.21 -toolchain go1.21.4 +toolchain go1.22.1 require ( github.com/99designs/gqlgen v0.17.45