From c239ff5e42e781b908106f7a62570e81063915fb Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 31 Jan 2024 18:24:25 -0500 Subject: [PATCH] make image_name variable work, OCI uses/expects conduit Signed-off-by: strawberry --- .github/workflows/ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74846f52..1c70056d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,15 +166,14 @@ jobs: - name: Publish to Dockerhub env: - REGISTRY: registry.hub.docker.com - IMAGE_NAME: ${{ env.REGISTRY }}/${{ github.repository }} + IMAGE_NAME: registry.hub.docker.com/${{ github.repository }} IMAGE_SUFFIX_AMD64: amd64 IMAGE_SUFFIX_ARM64V8: arm64v8 run: | docker load -i oci-image-amd64.tar.gz - IMAGE_ID_AMD64=$(docker images -q conduwuit:main) + IMAGE_ID_AMD64=$(docker images -q conduit:main) docker load -i oci-image-arm64v8.tar.gz - IMAGE_ID_ARM64V8=$(docker images -q conduwuit:main) + IMAGE_ID_ARM64V8=$(docker images -q conduit:main) # Tag and push the architecture specific images docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 @@ -195,15 +194,14 @@ jobs: - name: Publish to GitHub Container Registry env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ env.REGISTRY }}/${{ github.repository }} + IMAGE_NAME: ghcr.io/${{ github.repository }} IMAGE_SUFFIX_AMD64: amd64 IMAGE_SUFFIX_ARM64V8: arm64v8 run: | docker load -i oci-image-amd64.tar.gz - IMAGE_ID_AMD64=$(docker images -q conduwuit:main) + IMAGE_ID_AMD64=$(docker images -q conduit:main) docker load -i oci-image-arm64v8.tar.gz - IMAGE_ID_ARM64V8=$(docker images -q conduwuit:main) + IMAGE_ID_ARM64V8=$(docker images -q conduit:main) # Tag and push the architecture specific images docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64