diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8d970218..b466a2b0 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ^1.17 + go-version: ^1.22 id: go - uses: imjasonh/setup-crane@v0.3 diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 1eccc1f0..421fd2e3 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 +FROM golang:1.22 ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.6/docker-credential-gcr_linux_amd64-2.1.6.tar.gz /usr/local/bin RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_amd64-2.1.6.tar.gz diff --git a/deploy/Dockerfile.build b/deploy/Dockerfile.build index 577d25ae..fd76c62d 100644 --- a/deploy/Dockerfile.build +++ b/deploy/Dockerfile.build @@ -1,5 +1,5 @@ # Dockerfile used to build a build step that builds container-structure-test in CI. -FROM golang:1.19 +FROM golang:1.22 RUN apt-get update && apt-get install make RUN mkdir -p /go/src/github.com/GoogleContainerTools RUN ln -s /workspace /go/src/github.com/GoogleContainerTools/container-structure-test diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 221c210d..8e980042 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -1,4 +1,4 @@ -FROM golang:1.19 +FROM golang:1.22 ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.6/docker-credential-gcr_linux_amd64-2.1.6.tar.gz /usr/local/bin/ RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_amd64-2.1.6.tar.gz diff --git a/go.mod b/go.mod index 7b44fe46..798ab8ac 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/container-structure-test -go 1.19 +go 1.22 require ( github.com/GoogleContainerTools/container-diff v0.17.1-0.20230727210151-35d9770aeea3