From 876d0567056fcce09df3ee4c804e3a991c3cb3e7 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 14 Nov 2023 08:17:34 +0100 Subject: [PATCH] build: Fixup Docker changes from previous (#9223) --- .github/workflows/build-infra-dockers.yaml | 4 ++-- .github/workflows/build-syncthing.yaml | 6 +++--- Dockerfile | 4 ++-- Dockerfile.builder | 4 ++-- Dockerfile.stcrashreceiver | 4 ++-- Dockerfile.stdiscosrv | 4 ++-- Dockerfile.strelaypoolsrv | 4 ++-- Dockerfile.strelaysrv | 4 ++-- Dockerfile.stupgrades | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-infra-dockers.yaml b/.github/workflows/build-infra-dockers.yaml index 997ecc4e3..b1b2192e4 100644 --- a/.github/workflows/build-infra-dockers.yaml +++ b/.github/workflows/build-infra-dockers.yaml @@ -51,5 +51,5 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: syncthing/${{ matrix.pkg }}:latest,syncthing/${{ matrix.pkg }}:${{ github.sha }} - outputs: | - annotation.org.opencontainers.image.revision="${{ github.sha }}" + labels: | + org.opencontainers.image.revision=${{ github.sha }} diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml index aced02673..bc036accd 100644 --- a/.github/workflows/build-syncthing.yaml +++ b/.github/workflows/build-syncthing.yaml @@ -818,9 +818,9 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/7 push: ${{ env.DOCKER_PUSH == 'true' }} tags: ${{ env.DOCKER_TAGS }} - outputs: | - annotation.org.opencontainers.image.version="${{ env.VERSION }}" - annotation.org.opencontainers.image.revision="${{ github.sha }}" + labels: | + org.opencontainers.image.version=${{ env.VERSION }} + org.opencontainers.image.revision=${{ github.sha }} # # Check for known vulnerabilities in Go dependencies diff --git a/Dockerfile b/Dockerfile index 0b802aeeb..106fc931b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing" EXPOSE 8384 22000/tcp 22000/udp 21027/udp diff --git a/Dockerfile.builder b/Dockerfile.builder index 09b4519b0..19c099aae 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -5,8 +5,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Builder" # FPM to build Debian packages diff --git a/Dockerfile.stcrashreceiver b/Dockerfile.stcrashreceiver index 42e855da4..c964d6d57 100644 --- a/Dockerfile.stcrashreceiver +++ b/Dockerfile.stcrashreceiver @@ -5,8 +5,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Crash Receiver" EXPOSE 8080 diff --git a/Dockerfile.stdiscosrv b/Dockerfile.stdiscosrv index 654109b3c..cce3d8331 100644 --- a/Dockerfile.stdiscosrv +++ b/Dockerfile.stdiscosrv @@ -20,8 +20,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Discovery Server" EXPOSE 19200 8443 diff --git a/Dockerfile.strelaypoolsrv b/Dockerfile.strelaypoolsrv index 2b4d102fb..f7e2760e7 100644 --- a/Dockerfile.strelaypoolsrv +++ b/Dockerfile.strelaypoolsrv @@ -5,8 +5,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Relay Pool Server" EXPOSE 8080 diff --git a/Dockerfile.strelaysrv b/Dockerfile.strelaysrv index 8ef3cd205..3c07fbb5f 100644 --- a/Dockerfile.strelaysrv +++ b/Dockerfile.strelaysrv @@ -20,8 +20,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Relay Server" EXPOSE 22067 22070 diff --git a/Dockerfile.stupgrades b/Dockerfile.stupgrades index 49fc73fc3..c2bb4e3cb 100644 --- a/Dockerfile.stupgrades +++ b/Dockerfile.stupgrades @@ -5,8 +5,8 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \ org.opencontainers.image.url="https://syncthing.net" \ org.opencontainers.image.documentation="https://docs.syncthing.net" \ org.opencontainers.image.source="https://github.com/syncthing/syncthing" \ - org.opencontainers.image.vendor="The Syncthing Project" - org.opencontainers.image.licenses="MPL-2.0" + org.opencontainers.image.vendor="The Syncthing Project" \ + org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.title="Syncthing Upgrades" EXPOSE 8080