diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 89e22b7..7563e6b 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: - name: Extract version from Cargo.toml shell: bash run: | - echo "EW_VERSION=$(grep "^version" Cargo.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV + echo "APP_VERSION=$(grep "^version" Cargo.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV - name: Log in to DockerHub uses: docker/login-action@v3 @@ -39,9 +39,9 @@ jobs: uses: docker/metadata-action@master with: images: | - docker.io/ethanaobrien/ew + docker.io/ethanaobrien/ew flavor: | - latest=false + latest=false tags: | type=raw,value=latest @@ -52,10 +52,12 @@ jobs: push: true labels: | gitsha1=${{ github.sha }} - org.opencontainers.image.version=${{ env.EW_VERSION }} - tags: "${{ steps.set-tag.outputs.tags }}" + org.opencontainers.image.version=${{ env.APP_VERSION }} + tags: | + ${{ steps.set-tag.outputs.tags }} + docker.io/ethanaobrien/ew:${{ env.APP_VERSION }} file: "docker/Dockerfile" - platforms: linux/amd64 #,linux/arm64 + platforms: linux/amd64, linux/arm64 # arm64 builds OOM without the git fetch setting. c.f. # https://github.com/rust-lang/cargo/issues/10583