diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d0fdee5a3..a7740e6f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,6 +37,17 @@ jobs: - uses: depot/setup-action@v1 + - name: Generate Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: | + hkotel/mealie + ghcr.io/${{ github.repository }} + # Overwrite the image.version label with our tag + labels: | + org.opencontainers.image.version=${{ inputs.tag }} + - name: Retrieve Python package uses: actions/download-artifact@v4 with: @@ -57,5 +68,6 @@ jobs: hkotel/mealie:${{ inputs.tag }} ghcr.io/${{ github.repository }}:${{ inputs.tag }} ${{ inputs.tags }} + labels: ${{ steps.meta.outputs.labels }} build-args: | COMMIT=${{ github.sha }} diff --git a/docker/Dockerfile b/docker/Dockerfile index a116c9467..d81b68f14 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -111,7 +111,6 @@ RUN . $VENV_PATH/bin/activate \ # Production Image ############################################### FROM python-base AS production -LABEL org.opencontainers.image.source="https://github.com/mealie-recipes/mealie" ENV PRODUCTION=true ENV TESTING=false