diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65ba6a04..900853e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.21.5] + go-version: [1.22.1] os: [ubuntu-20.04, macos-12, windows-2019] steps: @@ -62,7 +62,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.21.5 + go-version: '1.22.1' - name: Set env shell: bash @@ -109,7 +109,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash @@ -139,7 +139,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash @@ -184,7 +184,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ddd0e92..179f0f1d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash @@ -151,7 +151,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash @@ -195,7 +195,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: '1.22.1' - name: Set env shell: bash diff --git a/Dockerfile b/Dockerfile index 1218eb20..36694d22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20 +FROM golang:1.22 RUN go install golang.org/x/tools/cmd/cover@latest \ && go install golang.org/x/lint/golint@latest diff --git a/hack/Dockerfile.alpine b/hack/Dockerfile.alpine index c8f8331a..f852520a 100644 --- a/hack/Dockerfile.alpine +++ b/hack/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine AS bld +FROM --platform=$BUILDPLATFORM golang:1.22.1-alpine AS bld ARG TARGETPLATFORM ARG TARGETARCH ARG TARGETVARIANT @@ -25,7 +25,7 @@ WORKDIR /manifest-tool COPY . /manifest-tool RUN /manifest-tool/hack/makestatic.sh $TARGETARCH ${TARGETVARIANT#v} -FROM --platform=$TARGETPLATFORM alpine:3.17.0 +FROM --platform=$TARGETPLATFORM alpine:3.19.1 COPY --from=bld /manifest-tool/manifest-tool /manifest-tool COPY --from=bld /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=bld --chown=0:0 /go/bin/docker-credential-gcr /usr/bin/docker-credential-gcloud diff --git a/hack/Dockerfile.linux b/hack/Dockerfile.linux index f3f7b8f4..b099ec46 100644 --- a/hack/Dockerfile.linux +++ b/hack/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine AS bld +FROM --platform=$BUILDPLATFORM golang:1.22.1-alpine AS bld ARG TARGETPLATFORM ARG TARGETARCH ARG TARGETVARIANT