From 7554acff00c08c3575d75eb7a679a3c74712ca97 Mon Sep 17 00:00:00 2001 From: Giacomo Debidda Date: Thu, 10 Oct 2024 13:40:40 +0200 Subject: [PATCH] cleanup labels in Dockerimage --- .github/workflows/ci-cd.yaml | 1 + Dockerfile | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml index c2b653c..b7f3a05 100755 --- a/.github/workflows/ci-cd.yaml +++ b/.github/workflows/ci-cd.yaml @@ -196,6 +196,7 @@ jobs: APP_NAME=${{env.APP_NAME }} APP_VERSION=${{env.APP_VERSION }} BB_VERSION=1.4.192 + CREATED_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} JSOUP_POD_VERSION=0.4.0 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index e721dcf..a3e8273 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,15 +106,10 @@ RUN bb -e "(require '[babashka.pods :as pods]) \ # mv $JSOUP_POD_BB_PATH $JSOUP_POD_PATH && \ # rm -rf "/home/${NON_ROOT_USER}/.babashka" +# When the image is built on GitHub Actions, additional labels are extracted by +# docker-metadata-action and written to the container image by build-and-push-docker-images. # https://github.com/opencontainers/image-spec/blob/main/annotations.md LABEL org.opencontainers.image.created=${CREATED_DATE} -LABEL org.opencontainers.image.description="CLI to download videos and slides from FOSDEM websites" -# https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ -LABEL org.opencontainers.image.licenses="MIT" -# This is required when pushing the container image from a computer to GitHub's Container Registry. -LABEL org.opencontainers.image.source=https://github.com/jackdbd/fosdem-dl -LABEL org.opencontainers.image.title=fosdem-dl -LABEL org.opencontainers.image.url=https://github.com/jackdbd/fosdem-dl ENTRYPOINT ["bb", "fosdem-dl.jar"] CMD ["help"]