diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6f1ebf..0aa48a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.ref }} path: src/github.com/estesp/manifest-tool @@ -56,9 +56,9 @@ jobs: steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.22.5' + go-version: '1.23.2' - name: Set env shell: bash @@ -70,7 +70,7 @@ jobs: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - name: Checkout manifest-tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: estesp/manifest-tool ref: ${{ github.ref }} @@ -108,7 +108,7 @@ jobs: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - name: Checkout manifest-tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: estesp/manifest-tool ref: ${{ github.ref }} @@ -149,9 +149,9 @@ jobs: steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.22.5' + go-version: '1.23.2' - name: Set env shell: bash @@ -163,7 +163,7 @@ jobs: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - name: Checkout manifest-tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: estesp/manifest-tool ref: ${{ github.ref }} @@ -193,9 +193,9 @@ jobs: steps: - name: Install Go - uses: actions/setup-go@v4 - with: - go-version: '1.22.5' + uses: actions/setup-go@v5 + 5ith: + go-version: '1.23.2' - name: Set env shell: bash @@ -213,7 +213,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Checkout manifest-tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: estesp/manifest-tool ref: ${{ github.ref }} diff --git a/hack/Dockerfile.alpine b/hack/Dockerfile.alpine index 41832b1..8621949 100644 --- a/hack/Dockerfile.alpine +++ b/hack/Dockerfile.alpine @@ -4,13 +4,15 @@ ARG TARGETARCH ARG TARGETVARIANT ARG BUILDPLATFORM ARG BUILDARCH +ARG GOPROXY RUN apk add bash git ENV GOOS linux ENV GOARCH $TARGETARCH ENV GOARMV $TARGETVARIANT +ENV GO_PROXY $GOPROXY # Get GCR credential helper -RUN GOARM=${GOARMV#v} go install github.com/GoogleCloudPlatform/docker-credential-gcr@latest +RUN GOARM=${GOARMV#v} go install github.com/GoogleCloudPlatform/docker-credential-gcr/v2@latest # Get Amazon ECR credential helper RUN GOARM=${GOARMV#v} go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login@latest @@ -25,7 +27,7 @@ WORKDIR /manifest-tool COPY . /manifest-tool RUN /manifest-tool/hack/makestatic.sh $TARGETARCH ${TARGETVARIANT#v} -FROM --platform=$TARGETPLATFORM alpine:3.19.2 +FROM --platform=$TARGETPLATFORM alpine:3.20.3 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