[MISC] Use skopeo builtin with rockcraft (#23)

* fix: Use skopeo builtin with rockcraft * fix: Use skopeo builtin in trivy job
canonical · Jul 23, 2024 · fbe3d50 · fbe3d50
1 parent 551140c
commit fbe3d50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git 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}
 

diff --git 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