Merge branch 'main' into withdraw-faster

wolfi-dev · Nov 7, 2023 · 24f625e · 24f625e
2 parents ac1a0d2 + a4ff172
commit 24f625e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build-world.yaml b/.github/workflows/build-world.yaml
@@ -24,7 +24,7 @@ jobs:
     # permissions:
 
     container:
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
       # TODO: Deprivilege
       options: |
         --cap-add NET_ADMIN --cap-add SYS_ADMIN --device /dev/fuse --security-opt seccomp=unconfined --security-opt apparmor:unconfined

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
     # permissions:
 
     container:
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
       # TODO: Deprivilege
       options: |
         --cap-add NET_ADMIN --cap-add SYS_ADMIN --device /dev/fuse --security-opt seccomp=unconfined --security-opt apparmor:unconfined
@@ -102,7 +102,7 @@ jobs:
 
     container:
       # NOTE: This step only signs and uploads, so it doesn't need any privileges
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -27,7 +27,7 @@ jobs:
         run: |
           # Copy wolfictl out of the wolfictl image and onto PATH
           TMP=$(mktemp -d)
-          docker run --rm -i -v $TMP:/out --entrypoint /bin/sh ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f -c "cp /usr/bin/wolfictl /out"
+          docker run --rm -i -v $TMP:/out --entrypoint /bin/sh ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b -c "cp /usr/bin/wolfictl /out"
           echo "$TMP" >> $GITHUB_PATH
 
       # Assuming that we have a list of changed files such as `foo.yaml` and `bar.yaml`, this
@@ -58,7 +58,7 @@ jobs:
       group: wolfi-builder-${{ matrix.arch }}
     needs: changes
     container:
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
       options: |
         --cap-add NET_ADMIN --cap-add SYS_ADMIN --security-opt seccomp=unconfined --security-opt apparmor:unconfined
     outputs:
@@ -142,7 +142,7 @@ jobs:
     name: "Scan packages for CVEs"
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
     needs: build
     if: needs.build.outputs.packages_were_built == 'true'
 

diff --git a/.github/workflows/lint-world.yaml b/.github/workflows/lint-world.yaml
@@ -29,7 +29,7 @@ jobs:
       group: wolfi-os-builder-${{ matrix.arch }}
 
     container:
-      image: ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+      image: ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/wolfictl-check-update.yaml b/.github/workflows/wolfictl-check-update.yaml
@@ -29,7 +29,7 @@ jobs:
     - name: Check
       id: check
       if: ${{ steps.files.outputs.all_changed_files != '' }}
-      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:98485b9415b8940403a9f103486005c7b1c7ad4510cd0d34e52d93283de9c1eb
+      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:59eb1c3efdcfeef2424464734efa10dd074814f38e9de31fea3699118e0431dd
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

diff --git a/.github/workflows/wolfictl-lint.yaml b/.github/workflows/wolfictl-lint.yaml
@@ -19,13 +19,13 @@ jobs:
     - uses: actions/checkout@v4
     - name: Lint
       id: lint
-      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:98485b9415b8940403a9f103486005c7b1c7ad4510cd0d34e52d93283de9c1eb
+      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:59eb1c3efdcfeef2424464734efa10dd074814f38e9de31fea3699118e0431dd
       with:
         entrypoint: wolfictl
         args: lint --skip-rule no-makefile-entry-for-package
     - name: Enforce YAML formatting
       id: lint-yaml
-      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:98485b9415b8940403a9f103486005c7b1c7ad4510cd0d34e52d93283de9c1eb
+      uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:59eb1c3efdcfeef2424464734efa10dd074814f38e9de31fea3699118e0431dd
       with:
         entrypoint: wolfictl
         args: lint yam
diff --git a/.github/workflows/wolfictl-update-gh.yaml b/.github/workflows/wolfictl-update-gh.yaml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:98485b9415b8940403a9f103486005c7b1c7ad4510cd0d34e52d93283de9c1eb
+    - uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:59eb1c3efdcfeef2424464734efa10dd074814f38e9de31fea3699118e0431dd
       with:
         entrypoint: wolfictl
         args: update https://github.com/${{github.repository}} --release-monitoring-query=false --github-labels request-version-update --github-labels "automated pr"

diff --git a/.github/workflows/wolfictl-update-rm.yaml b/.github/workflows/wolfictl-update-rm.yaml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:98485b9415b8940403a9f103486005c7b1c7ad4510cd0d34e52d93283de9c1eb
+    - uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:59eb1c3efdcfeef2424464734efa10dd074814f38e9de31fea3699118e0431dd
       with:
         entrypoint: wolfictl
         args: update https://github.com/${{github.repository}} --github-release-query=false --github-labels request-version-update --github-labels "automated pr"

diff --git a/Makefile b/Makefile
@@ -91,7 +91,7 @@ dev-container:
 	    -v "${PWD}:${PWD}" \
 	    -w "${PWD}" \
 	    -e SOURCE_DATE_EPOCH=0 \
-	    ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+	    ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
 
 PACKAGES_CONTAINER_FOLDER ?= /work/packages
 TMP_REPOSITORIES_DIR := $(shell mktemp -d)
@@ -156,6 +156,6 @@ dev-container-wolfi:
 		--mount type=bind,source="${PWD}/local-melange.rsa.pub",destination="/etc/apk/keys/local-melange.rsa.pub",readonly \
 		--mount type=bind,source="$(TMP_REPOSITORIES_FILE)",destination="/etc/apk/repositories",readonly \
 		-w "$(PACKAGES_CONTAINER_FOLDER)" \
-		ghcr.io/wolfi-dev/sdk:latest@sha256:148f4be783abe7d35df1e83f9c55d08cc7d7f3ca8b180b24923fb421bc96f97f
+		ghcr.io/wolfi-dev/sdk:latest@sha256:bdf3b189997f7f63d22ddf46afa012b80e09658e7108373eb705fcb397d95d8b
 	@rm "$(TMP_REPOSITORIES_FILE)"
 	@rmdir "$(TMP_REPOSITORIES_DIR)"