deps: Bump go-version to 1.21 (#170)

* Bump go-version to 1.21 * Replace deprecated go get with go install --------- Signed-off-by: harishsurf <[email protected]>
quay · Sep 10, 2024 · fd1813f · fd1813f
1 parent 73b8d86
commit fd1813f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/jobs.yml b/.github/workflows/jobs.yml
@@ -55,12 +55,12 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v4
         with:
-          go-version: ^1.13
+          go-version: ^1.21
         id: go
 
       - name: Get dependencies
         run: |
-          go get -v -t -d ./...
+          go install -v ./...
           if [ -f Gopkg.toml ]; then
               curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
               dep ensure

diff --git a/Dockerfile b/Dockerfile
@@ -22,8 +22,8 @@ ENV GOROOT=/usr/local/go
 ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH 
 
 # Get Go binary
-RUN curl -o go1.16.4.linux-amd64.tar.gz https://dl.google.com/go/go1.16.4.linux-amd64.tar.gz
-RUN tar -xzf go1.16.4.linux-amd64.tar.gz  &&\
+RUN curl -o go1.21.13.linux-amd64.tar.gz https://dl.google.com/go/go1.21.13.linux-amd64.tar.gz
+RUN tar -xzf go1.21.13.linux-amd64.tar.gz  &&\
     mv go /usr/local
 
 COPY . /cli

diff --git a/Dockerfile.online b/Dockerfile.online
@@ -17,8 +17,8 @@ ENV GOROOT=/usr/local/go
 ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH 
 
 # Get Go binary
-RUN curl -o go1.16.4.linux-amd64.tar.gz https://dl.google.com/go/go1.16.4.linux-amd64.tar.gz
-RUN tar -xzf go1.16.4.linux-amd64.tar.gz  &&\
+RUN curl -o go1.21.13.linux-amd64.tar.gz https://dl.google.com/go/go1.21.13.linux-amd64.tar.gz
+RUN tar -xzf go1.21.13.linux-amd64.tar.gz  &&\
     mv go /usr/local
 
 COPY . /cli

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ RELEASE_VERSION ?= dev
 all:
 
 build-golang-executable:
-	$(CLIENT) run --rm -v ${PWD}:/usr/src:Z -w /usr/src docker.io/golang:1.16 go build -v \
+	$(CLIENT) run --rm -v ${PWD}:/usr/src:Z -w /usr/src docker.io/golang:1.21 go build -v \
 	-ldflags "-X 'github.com/quay/mirror-registry/cmd.releaseVersion=${RELEASE_VERSION}' -X 'github.com/quay/mirror-registry/cmd.eeImage=${EE_IMAGE}' -X 'github.com/quay/mirror-registry/cmd.pauseImage=${PAUSE_IMAGE}' -X 'github.com/quay/mirror-registry/cmd.quayImage=${QUAY_IMAGE}' -X 'github.com/quay/mirror-registry/cmd.redisImage=${REDIS_IMAGE}' -X 'github.com/quay/mirror-registry/cmd.sqliteImage=${SQLITE_IMAGE}'" \
 	-o mirror-registry;
 

diff --git a/go.mod b/go.mod
@@ -1,12 +1,17 @@
 module github.com/quay/mirror-registry
 
-go 1.16
+go 1.21
 
 require (
 	github.com/lib/pq v1.10.0
 	github.com/sethvargo/go-password v0.2.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
+)
+
+require (
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
 	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect