From 91cd06a5e376de7e687c9d3eac2d9c1920e0d5b5 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Fri, 6 Oct 2023 14:56:00 +0200 Subject: [PATCH 1/2] syslog-ng: move OCI labels to their proper place Signed-off-by: Szilard Parrag --- syslog-ng/alpine.dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/syslog-ng/alpine.dockerfile b/syslog-ng/alpine.dockerfile index 3cfad016b3..cff8349ea9 100644 --- a/syslog-ng/alpine.dockerfile +++ b/syslog-ng/alpine.dockerfile @@ -3,17 +3,6 @@ FROM alpine:3.18 as apkbuilder ARG PKG_TYPE=stable ARG SNAPSHOT_VERSION -# https://github.com/opencontainers/image-spec/blob/main/annotations.md -LABEL maintainer="axoflow.io" -LABEL org.opencontainers.image.title="AxoSyslog" -LABEL org.opencontainers.image.description="A cloud-native distribution of syslog-ng by Axoflow" -LABEL org.opencontainers.image.authors="Axoflow" -LABEL org.opencontainers.image.vendor="Axoflow" -LABEL org.opencontainers.image.licenses="GPL-3.0-only" -LABEL org.opencontainers.image.source="https://github.com/axoflow/axosyslog-docker" -LABEL org.opencontainers.image.documentation="https://axoflow.com/docs/axosyslog/docs/" -LABEL org.opencontainers.image.url="https://axoflow.io/" - RUN apk add --update-cache \ alpine-conf \ alpine-sdk \ @@ -41,7 +30,18 @@ RUN mkdir packages \ FROM alpine:3.18 -LABEL maintainer="László Várady " + +# https://github.com/opencontainers/image-spec/blob/main/annotations.md +LABEL maintainer="axoflow.io" +LABEL org.opencontainers.image.title="AxoSyslog" +LABEL org.opencontainers.image.description="A cloud-native distribution of syslog-ng by Axoflow" +LABEL org.opencontainers.image.authors="Axoflow" +LABEL org.opencontainers.image.vendor="Axoflow" +LABEL org.opencontainers.image.licenses="GPL-3.0-only" +LABEL org.opencontainers.image.source="https://github.com/axoflow/axosyslog-docker" +LABEL org.opencontainers.image.documentation="https://axoflow.com/docs/axosyslog/docs/" +LABEL org.opencontainers.image.url="https://axoflow.io/" + COPY --from=apkbuilder /home/builder/packages/ / COPY --from=apkbuilder /home/builder/.abuild/*.pub /etc/apk/keys/ From 35ef04088c5f5c2b393f1547d7d6eb64758bb14d Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Fri, 6 Oct 2023 15:02:50 +0200 Subject: [PATCH 2/2] syslog-ng,ssc: fix OCI description label in multi-arch image case Signed-off-by: Szilard Parrag --- .github/workflows/ssc-stable.yml | 23 +++++++++++++---------- .github/workflows/syslog-ng-docker.yml | 3 +++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ssc-stable.yml b/.github/workflows/ssc-stable.yml index a3224b30ed..79053f49b2 100644 --- a/.github/workflows/ssc-stable.yml +++ b/.github/workflows/ssc-stable.yml @@ -77,6 +77,16 @@ jobs: images: ${{ env.DOCKER_IMAGE_NAME }} tags: type=match,pattern=ssc-(.*),group=1 sep-tags: ',' + labels: | # https://github.com/opencontainers/image-spec/blob/main/annotations.md + maintainer="axoflow.io" + org.opencontainers.image.title="AxoSyslog Splunk Connector" + org.opencontainers.image.description="A cloud-native distribution of syslog-ng by Axoflow" + org.opencontainers.image.authors="Axoflow" + org.opencontainers.image.vendor="Axoflow" + org.opencontainers.image.licenses="GPL-3.0-only" + org.opencontainers.image.source="https://github.com/axoflow/axosyslog-docker" + org.opencontainers.image.documentation="https://axoflow.com/docs/axosyslog/docs/" + org.opencontainers.image.url="https://axoflow.io/" - name: Build and push Docker image uses: docker/build-push-action@v3 @@ -89,13 +99,6 @@ jobs: build-args: | SYSLOGNG_VERSION=${{ env.SYSLOG_NG_IMG_VERSION }} VERSION=${{ needs.version.outputs.version }} - labels: | # https://github.com/opencontainers/image-spec/blob/main/annotations.md - maintainer="axoflow.io" - org.opencontainers.image.title="AxoSyslog Splunk Connector" - org.opencontainers.image.description="A cloud-native distribution of syslog-ng by Axoflow" - org.opencontainers.image.authors="Axoflow" - org.opencontainers.image.vendor="Axoflow" - org.opencontainers.image.licenses="GPL-3.0-only" - org.opencontainers.image.source="https://github.com/axoflow/axosyslog-docker" - org.opencontainers.image.documentation="https://axoflow.com/docs/axosyslog/docs/" - org.opencontainers.image.url="https://axoflow.io/" + # description should be here because it is a multi-arch image + # see docs: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images + outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.tags.outputs.json).labels['org.opencontainers.image.description'] }} diff --git a/.github/workflows/syslog-ng-docker.yml b/.github/workflows/syslog-ng-docker.yml index 8f35752997..9fde6443ab 100644 --- a/.github/workflows/syslog-ng-docker.yml +++ b/.github/workflows/syslog-ng-docker.yml @@ -75,6 +75,9 @@ jobs: platforms: ${{ env.PLATFORMS }} push: true tags: ${{ steps.tags.outputs.TAGS }} + # description should be here because it is a multi-arch image + # see docs: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images + outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=${{ fromJSON(steps.stable-tags.outputs.json).labels['org.opencontainers.image.description'] }} build-args: | PKG_TYPE=${{ inputs.pkg-type }} SNAPSHOT_VERSION=${{ inputs.snapshot-version }}