build: Fixup Docker changes from previous (#9223)

2024-11-18 11:05:14 +00:00 · 2023-11-14 08:17:34 +01:00 · 2023-11-14 08:17:34 +01:00 · 876d056705
commit 876d056705
parent e988978fa1
9 changed files with 19 additions and 19 deletions
--- 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 }}
--- 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
--- a/4
+++ b/4
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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