build(go): switch to go 1.21

Also update to the latest swaggo version, as the previous one did not work with go 1.21

Signed-off-by: Andrei Aaron <[email protected]>

.github/workflows/benchmark.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.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

.github/workflows/branch-cov.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

.github/workflows/build.yaml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -58,7 +58,7 @@ jobs:
       - name: Install other dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           sudo apt-get update
           sudo apt-get install rpm
           sudo apt-get install snapd

.github/workflows/cloc.yaml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Check out source code
         uses: actions/checkout@v4
       - name: Install dependencies

.github/workflows/cluster.yaml

@@ -31,11 +31,11 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get -y install rpm uidmap

.github/workflows/codeql-analysis.yml

@@ -49,7 +49,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         cache: false
-        go-version: 1.20.x
+        go-version: 1.21.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/compare-binary-size.yaml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout zot (main branch)
         run: |
           mkdir -p $GITHUB_WORKSPACE/zot_main

.github/workflows/ecosystem-tools.yaml

@@ -21,11 +21,11 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap

.github/workflows/gc-stress-test.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Run zb
         id: bench
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Run zb
         id: bench
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
       - name: Setup minio service
         run: |
@@ -161,7 +161,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
       - name: Setup minio service
         run: |

.github/workflows/golangci-lint.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v4
       - name: Run linter with GH action
         uses: golangci/golangci-lint-action@v3

.github/workflows/gqlgen.yaml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

.github/workflows/license.yaml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install go-licenses
         run: go install github.com/google/go-licenses@latest
       - name: Check for forbidden licenses

.github/workflows/nightly.yaml

@@ -19,11 +19,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
           sudo apt-get update
           sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config rpm uidmap
@@ -67,11 +67,11 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/swag@v1.8.12
+          go install github.com/swaggo/swag/cmd/swag@v1.16.2
           go mod download
       - name: Run sync harness
         run: |
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb
@@ -122,7 +122,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: ./.github/actions/setup-localstack
 
       - name: Run zb

.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.20
+    - name: Install go 1.21
       uses: actions/setup-go@v4
       with:
         cache: false
-        go-version: 1.20.x
+        go-version: 1.21.x
     - name: Checkout this PR
       uses: actions/checkout@v4
     - name: Start zot server

.github/workflows/sync-3rdparty-images.yaml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         golang_version:
-          - "1.20"
+          - "1.21"
     runs-on: ubuntu-latest
     steps:
       - name: Log in to GitHub Docker Registry

.github/workflows/test.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -105,7 +105,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Cache go dependencies
         id: cache-go-dependencies
         uses: actions/cache@v3
@@ -141,7 +141,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: download all workflow coverage files
         uses: actions/download-artifact@v3
       - name: merge code coverage

.github/workflows/tls.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE

.github/workflows/web-scan.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: false
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build zot

Makefile

@@ -27,7 +27,7 @@ ACTION_VALIDATOR_VERSION := v0.5.3
 ZUI_VERSION := commit-fad5572
 ZUI_REPO_OWNER := project-zot
 ZUI_REPO_NAME := zui
-SWAGGER_VERSION := v1.8.12
+SWAGGER_VERSION := v1.16.2
 STACKER := $(TOOLSDIR)/bin/stacker
 BATS := $(TOOLSDIR)/bin/bats
 TESTDATA := $(TOP_LEVEL)/test/data

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.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

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.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

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.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

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.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

build/Dockerfile-zxp

@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.21 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

build/stacker-conformance.yaml

@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

build/stacker-minimal.yaml

@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

build/stacker-zb.yaml

@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

build/stacker-zxp.yaml

@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

build/stacker.yaml

@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.20
+    url: docker://ghcr.io/project-zot/golang:1.21
   binds:
     - ../. -> /zotcopy
   run: |

go.mod

@@ -1,6 +1,8 @@
 module zotregistry.io/zot
 
-go 1.20
+go 1.21
+
+toolchain go1.21.4
 
 require (
 	github.com/99designs/gqlgen v0.17.40