From 48e1c8343ed5636645a80d7520b424b82de44aa0 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 20 Oct 2019 17:56:42 +0200 Subject: [PATCH] Fix Docker labels --- .github/workflows/build.yml | 6 +++--- Dockerfile | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4f8aa9..b6ba663 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,9 +35,9 @@ jobs: name: Docker Build run: | docker build \ - --label "org.label-schema.build-date=${{ steps.prepare.outputs.build_date }}" \ - --label "org.label-schema.version=${{ steps.prepare.outputs.version }}" \ - --label "org.label-schema.vcs-ref=${GITHUB_SHA::8}" \ + --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \ + --build-arg "VCS_REF=${GITHUB_SHA::8}" \ + --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \ --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --tag "${{ steps.prepare.outputs.docker_image }}:latest" \ --tag "${{ steps.prepare.outputs.quay_image }}:${{ steps.prepare.outputs.version }}" \ diff --git a/Dockerfile b/Dockerfile index b37b5ce..1252d40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,16 @@ FROM alpine:3.10 +ARG BUILD_DATE +ARG VCS_REF +ARG VERSION + LABEL maintainer="CrazyMax" \ + org.label-schema.build-date=$BUILD_DATE \ org.label-schema.name="librenms" \ org.label-schema.description="LibreNMS" \ + org.label-schema.version=$VERSION \ org.label-schema.url="https://github.com/librenms/docker" \ + org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/librenms/docker" \ org.label-schema.vendor="LibreNMS" \ org.label-schema.schema-version="1.0"