build: Fixup Docker changes from previous (#9223)

.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 }}

.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

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

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

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

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

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

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

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