Skip to content

Commit

Permalink
Merge pull request #8930 from wolfi-dev/update-digests
Browse files Browse the repository at this point in the history
Update images digests
  • Loading branch information
imjasonh authored Dec 4, 2023
2 parents ccfd768 + 7e0a47c commit 2888951
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-world.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# permissions:

container:
image: ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503
# TODO: Deprivilege
options: |
--cap-add NET_ADMIN --cap-add SYS_ADMIN --device /dev/fuse --security-opt seccomp=unconfined --security-opt apparmor:unconfined
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# permissions:

container:
image: ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503
# TODO: Deprivilege
options: |
--cap-add NET_ADMIN --cap-add SYS_ADMIN --device /dev/fuse --security-opt seccomp=unconfined --security-opt apparmor:unconfined
Expand Down Expand Up @@ -110,7 +110,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:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -205,7 +205,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:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d -c "cp /usr/bin/wolfictl /out"
docker run --rm -i -v $TMP:/out --entrypoint /bin/sh ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503 -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
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
group: wolfi-builder-${{ matrix.arch }}
needs: changes
container:
image: ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503
options: |
--cap-add NET_ADMIN --cap-add SYS_ADMIN --security-opt seccomp=unconfined --security-opt apparmor:unconfined
outputs:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
name: "Scan packages for CVEs"
runs-on: ubuntu-latest
container:
image: ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503
needs: build
if: needs.build.outputs.packages_were_built == 'true'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-world.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
group: wolfi-os-builder-${{ matrix.arch }}

container:
image: ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
image: ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/withdraw-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d -c "cp /usr/bin/wolfictl /out"
docker run --rm -i -v $TMP:/out --entrypoint /bin/sh ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503 -c "cp /usr/bin/wolfictl /out"
echo "$TMP" >> $GITHUB_PATH
- name: 'Authenticate to Google Cloud'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wolfictl-check-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:2896ee68bc353a0601cbd9b3ae9e0a8e866fe99006fe4f05404271e2b98f1038
uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:b4a8bb09eb7b85b48527cf4545ccf6cfad0b247443c0f128c24c5ff5c84ab8e6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wolfictl-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- uses: actions/checkout@v4
- name: Lint
id: lint
uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:2896ee68bc353a0601cbd9b3ae9e0a8e866fe99006fe4f05404271e2b98f1038
uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:b4a8bb09eb7b85b48527cf4545ccf6cfad0b247443c0f128c24c5ff5c84ab8e6
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:2896ee68bc353a0601cbd9b3ae9e0a8e866fe99006fe4f05404271e2b98f1038
uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:b4a8bb09eb7b85b48527cf4545ccf6cfad0b247443c0f128c24c5ff5c84ab8e6
with:
entrypoint: wolfictl
args: lint yam
2 changes: 1 addition & 1 deletion .github/workflows/wolfictl-update-gh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:2896ee68bc353a0601cbd9b3ae9e0a8e866fe99006fe4f05404271e2b98f1038
- uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:b4a8bb09eb7b85b48527cf4545ccf6cfad0b247443c0f128c24c5ff5c84ab8e6
with:
entrypoint: wolfictl
args: update https://github.com/${{github.repository}} --release-monitoring-query=false --github-labels request-version-update --github-labels "automated pr"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wolfictl-update-rm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:2896ee68bc353a0601cbd9b3ae9e0a8e866fe99006fe4f05404271e2b98f1038
- uses: docker://ghcr.io/wolfi-dev/wolfictl:latest@sha256:b4a8bb09eb7b85b48527cf4545ccf6cfad0b247443c0f128c24c5ff5c84ab8e6
with:
entrypoint: wolfictl
args: update https://github.com/${{github.repository}} --github-release-query=false --github-labels request-version-update --github-labels "automated pr"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ dev-container:
-v "${PWD}:${PWD}" \
-w "${PWD}" \
-e SOURCE_DATE_EPOCH=0 \
ghcr.io/wolfi-dev/sdk:latest@sha256:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503

PACKAGES_CONTAINER_FOLDER ?= /work/packages
TMP_REPOSITORIES_DIR := $(shell mktemp -d)
Expand Down Expand Up @@ -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:bb5769922852c5a389e7ef2dfaab1d07312dd2cbad66552df77dfefe4c1d022d
ghcr.io/wolfi-dev/sdk:latest@sha256:a7966875dc19b44de59ce2e2b3b4cea2038204b6adccb88365d45553a97f1503
@rm "$(TMP_REPOSITORIES_FILE)"
@rmdir "$(TMP_REPOSITORIES_DIR)"

0 comments on commit 2888951

Please sign in to comment.