🌱 fix builder-image and some other minor fixes

syself · Sep 26, 2023 · edf9858 · edf9858
1 parent 2e64d35
commit edf9858
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 20 deletions.
diff --git a/.builder-image-version.txt b/.builder-image-version.txt
@@ -1 +1 @@
-1.0.9
+1.0.8
diff --git a/.github/actions/manager-image/action.yaml b/.github/actions/manager-image/action.yaml
@@ -44,7 +44,7 @@ runs:
 
     # Import GitHub's cache build to docker cache
     - name: Copy Caph Golang cache to docker cache
-      uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+      uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
       with:
         provenance: false
         context: /tmp/.cache/caph
@@ -54,7 +54,7 @@ runs:
         target: import-cache
 
     - name: Build and push manager image
-      uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
+      uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
       with:
         provenance: false
         context: .

diff --git a/.github/actions/metadata/action.yaml b/.github/actions/metadata/action.yaml
@@ -22,7 +22,7 @@ runs:
   steps:
     - name: Docker manager metadata
       id: meta
-      uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
+      uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
       with:
         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
         flavor: ${{ inputs.metadata_flavor }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,7 +81,7 @@ jobs:
 
       # Import GitHub's cache build to docker cache
       - name: Copy Caph Golang cache to docker cache
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           provenance: false
           context: /tmp/.cache/caph
@@ -91,7 +91,7 @@ jobs:
           target: import-cache
 
       - name: Build and push manager image
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
         id: docker_build_release
         with:
           provenance: false
@@ -127,7 +127,7 @@ jobs:
       # Store docker's golang's cache build locally only on the main branch
       - name: Store Caph Golang cache build locally
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           provenance: false
           context: .

diff --git a/.github/workflows/main-promote-builder-image.yml b/.github/workflows/main-promote-builder-image.yml
@@ -10,7 +10,7 @@ jobs:
     name: Promote Latest tag to Caph Builder Image
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.7
+      image: ghcr.io/syself/caph-builder:1.0.8
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -14,7 +14,7 @@ jobs:
     if: github.event_name != 'pull_request_target' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.7
+      image: ghcr.io/syself/caph-builder:1.0.8
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
           echo 'EOF' >> $GITHUB_ENV
 
       - name: Build and push manager image
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
         id: docker_build_release
         with:
           provenance: false

diff --git a/.github/workflows/schedule-cache-cleaner-caph-image.yml b/.github/workflows/schedule-cache-cleaner-caph-image.yml
@@ -12,10 +12,6 @@ concurrency:
 jobs:
   cache-cleaner:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        include:
-          - name: symin
     steps:
       # Load Golang cache build from GitHub
       - name: Load Caph Golang cache build from GitHub

diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml
@@ -9,7 +9,7 @@ jobs:
     name: Trivy
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/syself/caph-builder:1.0.7
+      image: ghcr.io/syself/caph-builder:1.0.8
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

diff --git a/hack/upgrade-builder-image.sh b/hack/upgrade-builder-image.sh
@@ -25,11 +25,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ -z "${BUILDER_IMAGE:-}" ]; then
-  echo "Please provide BUILDER_IMAGE as env var"
-  exit 1
-fi
-
+export BUILDER_IMAGE=ghcr.io/syself/caph-builder
 
 REPO_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}")/..)
 cd "${REPO_ROOT}" || exit 1