From 28dbf76789cd98c57563df2c41584a594264978b Mon Sep 17 00:00:00 2001 From: trev Date: Sat, 17 May 2025 01:43:58 -0400 Subject: [PATCH] fix: use repo name as name --- .github/workflows/release.yaml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2e2c660..f241bcc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -88,28 +88,27 @@ jobs: run: | TAG=${{ github.ref_name }} VERSION=${TAG#v} - - NAME="trevstack:${VERSION}" - REPOSITORY=${{ github.repository }} - REGISTRY="ghcr.io/${REPOSITORY}" + NAME="${REPOSITORY}:${VERSION}" + REGISTRY="ghcr.io" echo "VERSION=${VERSION}" >> $GITHUB_ENV + echo "REPOSITORY=${REPOSITORY}" >> $GITHUB_ENV echo "NAME=${NAME}" >> $GITHUB_ENV echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: ${REGISTRY} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build & Load Images run: | - nix build .#trevstack-linux-amd64-image && ./result | docker load - nix build .#trevstack-linux-arm64-image && ./result | docker load - nix build .#trevstack-linux-arm-image && ./result | docker load + nix build .#${REPOSITORY}-linux-amd64-image && ./result | docker load + nix build .#${REPOSITORY}-linux-arm64-image && ./result | docker load + nix build .#${REPOSITORY}-linux-arm-image && ./result | docker load - name: Push Images run: | @@ -133,14 +132,14 @@ jobs: docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm64 --arch arm64 docker manifest annotate ${REGISTRY}/${NAME} ${REGISTRY}/${NAME}-arm --arch arm - docker manifest create ${REGISTRY}/trevstack:latest \ + docker manifest create ${REGISTRY}/${REPOSITORY}:latest \ ${REGISTRY}/${NAME}-amd64 \ ${REGISTRY}/${NAME}-arm64 \ ${REGISTRY}/${NAME}-arm - docker manifest annotate ${REGISTRY}/trevstack:latest ${REGISTRY}/${NAME}-amd64 --arch amd64 - docker manifest annotate ${REGISTRY}/trevstack:latest ${REGISTRY}/${NAME}-arm64 --arch arm64 - docker manifest annotate ${REGISTRY}/trevstack:latest ${REGISTRY}/${NAME}-arm --arch arm + docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-amd64 --arch amd64 + docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm64 --arch arm64 + docker manifest annotate ${REGISTRY}/${REPOSITORY}:latest ${REGISTRY}/${NAME}-arm --arch arm docker manifest push ${REGISTRY}/${NAME} - docker manifest push ${REGISTRY}/trevstack:latest + docker manifest push ${REGISTRY}/${REPOSITORY}:latest