chore: use skopeo from rockcraft

canonical · Jun 17, 2024 · c8310d7 · c8310d7
1 parent a1e49b7
commit c8310d7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -10,9 +10,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install skopeo
+      - name: Install rockcraft
         run: |
-          sudo snap install --devmode --channel edge skopeo
+          sudo snap install rockcraft --classic --channel edge
 
       - name: Install yq
         run: |
@@ -29,7 +29,7 @@ jobs:
           version="$(yq '.version' rockcraft.yaml)"
           echo "version=${version}" >> $GITHUB_ENV
           rock_file=$(ls *.rock | tail -n 1)
-          sudo skopeo \
+          sudo rockcraft.skopeo \
             --insecure-policy \
             copy \
             oci-archive:"${rock_file}" \

diff --git a/.github/workflows/publish-rock.yaml b/.github/workflows/publish-rock.yaml
@@ -17,9 +17,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install skopeo
+      - name: Install rockcraft
         run: |
-          sudo snap install --devmode --channel edge skopeo
+          sudo snap install rockcraft --classic --channel edge
       - uses: actions/download-artifact@v4
         with:
           name: rock
@@ -29,7 +29,7 @@ jobs:
           image_name="$(yq '.name' rockcraft.yaml)"
           version="$(yq '.version' rockcraft.yaml)"
           rock_file=$(ls *.rock | tail -n 1)
-          sudo skopeo \
+          sudo rockcraft.skopeo \
             --insecure-policy \
             copy \
             oci-archive:"${rock_file}" \

diff --git a/.github/workflows/scan-rock.yaml b/.github/workflows/scan-rock.yaml
@@ -10,9 +10,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install skopeo
+      - name: Install rockcraft
         run: |
-          sudo snap install --devmode --channel edge skopeo
+          sudo snap install rockcraft --classic --channel edge
 
       - name: Install yq
         run: |
@@ -29,7 +29,7 @@ jobs:
           version="$(yq '.version' rockcraft.yaml)"
           echo "version=${version}" >> $GITHUB_ENV
           rock_file=$(ls *.rock | tail -n 1)
-          sudo skopeo \
+          sudo rockcraft.skopeo \
             --insecure-policy \
             copy \
             oci-archive:"${rock_file}" \

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,6 +5,6 @@
 ```bash
 rockcraft pack -v
 vault_version=$(yq '.version' rockcraft.yaml)
-sudo skopeo --insecure-policy copy oci-archive:vault_${vault_version}_amd64.rock docker-daemon:vault:${vault_version}
+sudo rockcraft.skopeo --insecure-policy copy oci-archive:vault_${vault_version}_amd64.rock docker-daemon:vault:${vault_version}
 docker run vault:${vault_version}
 ```