build: move back to official golang image, ratchet update

nais · Jul 12, 2023 · 1584825 · 1584825
1 parent 8f87814
commit 1584825
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,9 +41,7 @@ jobs:
       packages: "write"
     runs-on: ubuntu-latest
     env:
-      BUILDER_IMG: "cgr.dev/chainguard/go:1.20"
       RUNNER_IMG: "cgr.dev/chainguard/static"
-      BASEIMG_IDENTITY: "https://github.com/chainguard-images/images/.github/workflows/release.yaml@refs/heads/main"
       BASEIMG_ISSUER: "https://token.actions.githubusercontent.com"
     steps:
       - name: Checkout
@@ -52,11 +50,9 @@ jobs:
         uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 # ratchet:sigstore/cosign-installer@main
         with:
           cosign-release: 'v2.0.0'
-      - name: Verify builder image
-        run: cosign verify --certificate-identity ${{ env.BASEIMG_IDENTITY }} --certificate-oidc-issuer ${{ env.BASEIMG_ISSUER }} ${{ env.BUILDER_IMG }}
       - name: Verify runner image
         run: cosign verify --certificate-identity ${{ env.BASEIMG_IDENTITY }} --certificate-oidc-issuer ${{ env.BASEIMG_ISSUER }} ${{ env.RUNNER_IMG }}
-      - uses: nais/platform-build-push-sign@3089e4707cf0721ccdc812ab218c6e061de59371 # ratchet:nais/platform-build-push-sign@main
+      - uses: nais/platform-build-push-sign@fb7da39ee56c8904ed15c02705a1780cb278a65b # ratchet:nais/platform-build-push-sign@main
         id: build_push_sign
         with:
           name: jwker

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM cgr.dev/chainguard/go:1.20 as builder
+FROM golang:1.20 as builder
 
 COPY . /workspace
 WORKDIR /workspace