From a29c9b9b09cf2d74f266dbca0d76fe44012cd762 Mon Sep 17 00:00:00 2001 From: Alex Batisse Date: Tue, 23 Jul 2024 16:32:00 +0200 Subject: [PATCH 1/2] fix: Use skopeo builtin with rockcraft --- .github/workflows/publish.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5764c8c..0013596 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -59,13 +59,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install skopeo - run: | - sudo snap install --devmode --channel edge skopeo - - - name: Install yq + - name: Install dependencies run: | sudo snap install yq + sudo snap install rockcraft --classic --edge - uses: actions/download-artifact@v3 with: @@ -89,7 +86,7 @@ jobs: ROCK_FILE=${{ needs.build.outputs.rock }} - sudo skopeo --insecure-policy copy \ + sudo rockcraft.skopeo --insecure-policy copy \ oci-archive:${ROCK_FILE} \ docker-daemon:${IMAGE_NAME}:${TAG} From b3256735c44d8c9f7e4b9630a0a381be5dba7c0e Mon Sep 17 00:00:00 2001 From: Alex Batisse Date: Tue, 23 Jul 2024 17:02:52 +0200 Subject: [PATCH 2/2] fix: Use skopeo builtin in trivy job --- .github/workflows/trivy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index e2d9d68..e0174cc 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -14,15 +14,15 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Install skopeo + - name: Install dependencies run: | - sudo snap install --devmode --channel edge skopeo + sudo snap install rockcraft --classic --edge - uses: actions/download-artifact@v3 with: name: charmed-kafka - name: Import locally run: | - sudo skopeo --insecure-policy copy \ + sudo rockcraft.skopeo --insecure-policy copy \ oci-archive:${{ needs.build.outputs.rock }} \ docker-daemon:trivy/charmed-kafka:test