diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 82d8f2c..f76ef93 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -23,13 +23,17 @@ jobs: run: | VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${VERSION#refs/*/}" - echo "Version: ${VERSION}" - echo "version=${VERSION}" >> $GITHUB_OUTPUT + + echo "Version (raw): ${VERSION}" + echo "Version (cleaned): ${VERSION/v/}" + + echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT + echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT - uses: actions/checkout@v5.0.0 with: fetch-tags: true - ref: "${{ steps.version_extraction.outputs.version }}" + ref: "${{ steps.version_extraction.outputs.version_raw }}" - uses: docker/setup-qemu-action@v3.6.0 - uses: docker/setup-buildx-action@v3.11.1 @@ -49,7 +53,7 @@ jobs: --platform linux/arm64 \ --file Dockerfile \ --provenance false \ - --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 \ + --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 \ --push \ . @@ -61,13 +65,17 @@ jobs: run: | VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${VERSION#refs/*/}" - echo "Version: ${VERSION}" - echo "version=${VERSION}" >> $GITHUB_OUTPUT + + echo "Version (raw): ${VERSION}" + echo "Version (cleaned): ${VERSION/v/}" + + echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT + echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT - uses: actions/checkout@v5.0.0 with: fetch-tags: true - ref: "${{ steps.version_extraction.outputs.version }}" + ref: "${{ steps.version_extraction.outputs.version_raw }}" - uses: docker/setup-qemu-action@v3.6.0 - uses: docker/setup-buildx-action@v3.11.1 @@ -87,7 +95,7 @@ jobs: --platform linux/amd64 \ --file Dockerfile \ --provenance false \ - --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \ + --tag git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \ --push \ . @@ -102,8 +110,12 @@ jobs: run: | VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${VERSION#refs/*/}" - echo "Version: ${VERSION}" - echo "version=${VERSION}" >> $GITHUB_OUTPUT + + echo "Version (raw): ${VERSION}" + echo "Version (cleaned): ${VERSION/v/}" + + echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT + echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT - uses: docker/login-action@v3.6.0 with: @@ -113,11 +125,11 @@ jobs: - name: Create and push manifest run: | - docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \ - --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-amd64 \ - --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }}-arm64 + docker manifest create git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \ + --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-amd64 \ + --amend git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }}-arm64 - docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} + docker manifest push git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} sync-to-hub-docker-io: needs: @@ -129,13 +141,15 @@ jobs: run: | VERSION="${{ inputs.tag || github.ref_name }}" VERSION="${VERSION#refs/*/}" - echo "Version: ${VERSION}" - echo "version=${VERSION}" >> $GITHUB_OUTPUT + + echo "Version (raw): ${VERSION}" + echo "Version (cleaned): ${VERSION/v/}" + + echo "version_raw=${VERSION}" >> $GITHUB_OUTPUT + echo "version_cleaned=${VERSION/v/}" >> $GITHUB_OUTPUT - name: Copy images to docker.io run: | - TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm') - apt-get update --yes apt-get install --yes skopeo skopeo copy \ @@ -144,5 +158,5 @@ jobs: --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \ --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \ --src-username volker.raschek \ - docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version }} \ - docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version }} \ No newline at end of file + docker://git.cryptic.systems/volker.raschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \ + docker://docker.io/volkerraschek/docker-compose:${{ steps.version_extraction.outputs.version_cleaned }} \ No newline at end of file