diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9389b0b..b57c724 100644 --- 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} \ No newline at end of file diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml index 4d6719e..ba21663 100644 --- a/.github/workflows/trivy.yaml +++ b/.github/workflows/trivy.yaml @@ -15,9 +15,9 @@ 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 @@ -25,7 +25,7 @@ jobs: - 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