From c117d8baa12615fe891c711faa9c3b13a73b825e Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Mon, 13 Mar 2023 23:41:43 +0000 Subject: [PATCH] Add all `org.opencontainers.image.xxx` labels using `--label` instead of `LABEL` --- .docker/release/Dockerfile | 3 --- .github/workflows/docker.yml | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile index b70d1757b..31b431e34 100644 --- a/.docker/release/Dockerfile +++ b/.docker/release/Dockerfile @@ -23,9 +23,6 @@ RUN set -eux; \ FROM php:8.1-fpm-alpine AS final LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm on Alpine" -LABEL org.opencontainers.image.source=https://github.com/the-djmaze/snappymail -LABEL org.opencontainers.image.description="SnappyMail" -LABEL org.opencontainers.image.licenses="AGPL v3.0" # Install dependencies such as nginx RUN apk add --no-cache ca-certificates nginx supervisor bash diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 671515d51..d86baa139 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -42,6 +42,10 @@ jobs: type=ref,suffix=-{{sha}},event=branch type=ref,event=tag type=ref,suffix=-{{sha}},event=tag + # The rest of the org.opencontainers.image.xxx labels are dynamically generated + labels: | + org.opencontainers.image.description=SnappyMail + org.opencontainers.image.licenses=AGPLv3 # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache - name: Set up QEMU @@ -83,6 +87,7 @@ jobs: platforms: linux/386,linux/amd64 push: true tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max