use rockcraft.skopeo

canonical · Dec 6, 2024 · c6116be · c6116be
1 parent a1121ba
commit c6116be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -26,9 +26,9 @@ jobs:
           sudo addgroup --system docker; sudo adduser $USER docker
           newgrp docker
           sudo snap disable docker; sudo snap enable docker
-      - name: Install skopeo
+      - name: Install rockcraft.skopeo
         run: |
-          sudo apt-get -y update && sudo apt-get -y install skopeo
+          sudo snap install rockcraft --classic
       - name: Install yq
         run: |
           sudo snap install yq
@@ -49,7 +49,7 @@ jobs:
           base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           tag=${version}-${base}-${{ env.RELEASE }}
           echo "Publishing valkey:${tag}"
-          sudo skopeo --insecure-policy copy \
+          sudo rockcraft.skopeo --insecure-policy copy \
             oci-archive:valkey_${rock_image_version}_amd64.rock \
             docker-daemon:ghcr.io/canonical/valkey:${tag}
           docker push ghcr.io/canonical/valkey:${tag}
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
@@ -15,17 +15,17 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Install skopeo
+      - name: Install rockcraft.skopeo
         run: |
-          sudo apt-get -y update && sudo apt-get -y install skopeo
+          sudo snap install rockcraft --classic
       - uses: actions/download-artifact@v3
         with:
           name: valkey-rock
           path: .
       - name: Import locally
         run: |
           rock_image_version=$(yq '(.version)' rockcraft.yaml)
-          sudo skopeo --insecure-policy copy \
+          sudo rockcraft.skopeo --insecure-policy copy \
             oci-archive:valkey_${rock_image_version}_amd64.rock \
             docker-daemon:trivy/valkey:test