Skip to content

Commit

Permalink
Run skopeo via docker in integration test jobs (#8355) (#8366)
Browse files Browse the repository at this point in the history
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
  • Loading branch information
grafanabot and pstibrany authored Jun 13, 2024
1 parent 05babdd commit 39f7ea6
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,9 @@ jobs:
run: |
export IMAGE_TAG=$(make image-tag)
# skopeo will by default load system-specific version of the image (linux/amd64).
skopeo copy oci-archive:/tmp/images/mimirtool.oci "docker-daemon:grafana/mimirtool:$IMAGE_TAG"
# note that this doesn't use skopeo version from our build-image, because we don't use build-image when running integration tests.
# that's why we use docker run to run latest version.
docker run -v /tmp/images:/tmp/images -v /var/run/docker.sock:/var/run/docker.sock quay.io/skopeo/stable:v1.15.1 copy oci-archive:/tmp/images/mimirtool.oci "docker-daemon:grafana/mimirtool:$IMAGE_TAG"
- name: Download Archive with Docker Images
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -420,7 +422,9 @@ jobs:
run: |
export IMAGE_TAG=$(make image-tag)
# skopeo will by default load system-specific version of the image (linux/amd64).
skopeo copy oci-archive:/tmp/images/mimirtool.oci "docker-daemon:grafana/mimirtool:$IMAGE_TAG"
# note that this doesn't use skopeo version from our build-image, because we don't use build-image when running integration tests.
# that's why we use docker run to run latest version.
docker run -v /tmp/images:/tmp/images -v /var/run/docker.sock:/var/run/docker.sock quay.io/skopeo/stable:v1.15.1 copy oci-archive:/tmp/images/mimirtool.oci "docker-daemon:grafana/mimirtool:$IMAGE_TAG"
- name: Download Archive with Docker Images
uses: actions/download-artifact@v4
with:
Expand Down

0 comments on commit 39f7ea6

Please sign in to comment.