From 6f866c1c0bf7d731d931a98d49ee06599a3941cf Mon Sep 17 00:00:00 2001
From: Lukas Prettenthaler <lukas.prettenthaler@tipico.us>
Date: Sun, 12 Jun 2022 20:32:25 +0200
Subject: [PATCH] cleanup

---
 .github/workflows/bridge.yml    | 12 ++++++------
 .github/workflows/multiarch.yml | 12 ++++++------
 Dockerfile.bridge               | 10 ++++++++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml
index d43c2d7..00cabfb 100644
--- a/.github/workflows/bridge.yml
+++ b/.github/workflows/bridge.yml
@@ -106,12 +106,12 @@ jobs:
       - name: Create multi-arch manifest
         run: |
           buildah manifest create ${{ env.IMAGE_NAME }}:latest
-          buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64
-          buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386
-          buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8
-          buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7
-          buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6
-          buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64
+          buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64
+          buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386
+          buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8
+          buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7
+          buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6
+          buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64
 
       - name: Push unstable images
         if: ${{ inputs.event == 'push' }}
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
index bdece04..377c349 100644
--- a/.github/workflows/multiarch.yml
+++ b/.github/workflows/multiarch.yml
@@ -87,12 +87,12 @@ jobs:
       - name: Create multi-arch manifest
         run: |
           buildah manifest create ${{ env.IMAGE_NAME }}:latest
-          buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64
-          buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386
-          buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8
-          buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7
-          buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6
-          buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64
+          buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64
+          buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386
+          buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8
+          buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7
+          buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6
+          buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64
 
       - name: Push unstable images
         if: ${{ github.event_name == 'push' }}
diff --git a/Dockerfile.bridge b/Dockerfile.bridge
index 39a112d..b7126b6 100644
--- a/Dockerfile.bridge
+++ b/Dockerfile.bridge
@@ -3,13 +3,19 @@ ARG FROM_VERSION=latest
 
 FROM ${FROM_IMAGE}:${FROM_VERSION}
 
-RUN apk add --no-cache --purge --clean-protected iptables \
-  && rm -rf /var/cache/apk/*
+LABEL org.opencontainers.image.title="zerotier" \
+      org.opencontainers.image.version="bridge-${ZT_VERSION}" \
+      org.opencontainers.image.description="ZeroTier One as Docker Image" \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.source="https://github.com/zyclonite/zerotier-docker"
 
 ENV LOG_PATH=/var/log/supervisor
 
 COPY scripts/entrypoint-bridge.sh /usr/sbin/
 
+RUN apk add --no-cache --purge --clean-protected iptables \
+  && rm -rf /var/cache/apk/*
+
 EXPOSE 9993/udp
 
 ENTRYPOINT ["entrypoint-bridge.sh"]