fix: Remove broken label

.gitea/workflows/build.yml

@@ -4,11 +4,22 @@ on:
   push:
 
 jobs:
-  Build Image:
+  Build Images:
     runs-on: [ubuntu-latest, amd]
+    strategy:
+      matrix:
+        variant:
+          - target: default
+            tag_suffix: ""
+            dockerfile: "Dockerfile"
+          - target: hsd
+            tag_suffix: "-hsd"
+            dockerfile: "Dockerfile.hsd"
+
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Docker
         run : |
           apt-get install ca-certificates curl gnupg
@@ -17,7 +28,7 @@ jobs:
           chmod a+r /etc/apt/keyrings/docker.gpg
           echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
           apt-get update
-          apt-get install docker-ce-cli -y          
+          apt-get install docker-ce-cli -y
       - name: Build Docker image
         run : |          
           echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
@@ -34,43 +45,8 @@ jobs:
           fi
           
 
-          docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$GITEA_SHA --build-arg VERSION=$GITEA_TAG -t firewallet:$tag_num .
+          docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$GITEA_SHA --build-arg VERSION=$GITEA_TAG --file ${{matrix.variant.dockerfile}} -t firewallet${{matrix.variant.tag_suffix}}:$tag_num .
-          docker tag firewallet:$tag_num git.woodburn.au/nathanwoodburn/firewallet:$tag_num
+          docker tag firewallet${{matrix.variant.tag_suffix}}:$tag_num git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag_num
-          docker push git.woodburn.au/nathanwoodburn/firewallet:$tag_num
+          docker push git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag_num
-          docker tag firewallet:$tag_num git.woodburn.au/nathanwoodburn/firewallet:$tag
+          docker tag firewallet${{matrix.variant.tag_suffix}}:$tag_num git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag
-          docker push git.woodburn.au/nathanwoodburn/firewallet:$tag
+          docker push git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag
-  Build Image with HSD:
-    runs-on: [ubuntu-latest, amd]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Docker
-        run : |
-          apt-get install ca-certificates curl gnupg
-          install -m 0755 -d /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          chmod a+r /etc/apt/keyrings/docker.gpg
-          echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-          apt-get update
-          apt-get install docker-ce-cli -y          
-      - name: Build Docker image
-        run : |          
-          echo "${{ secrets.DOCKERGIT_TOKEN }}" | docker login git.woodburn.au -u nathanwoodburn --password-stdin
-          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
-          tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          tag=${tag//\//-}
-          tag_num=${GITHUB_RUN_NUMBER}
-          echo "tag_num=$tag_num"
-
-          if [[ "$tag" == "main" ]]; then
-            tag="latest"
-          else
-            tag_num="${tag}-${tag_num}"
-          fi
-          
-
-          docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$GITEA_SHA --build-arg VERSION=$GITEA_TAG -t firewallet-hsd:$tag_num .
-          docker tag firewallet-hsd:$tag_num git.woodburn.au/nathanwoodburn/firewallet-hsd:$tag_num
-          docker push git.woodburn.au/nathanwoodburn/firewallet-hsd:$tag_num
-          docker tag firewallet-hsd:$tag_num git.woodburn.au/nathanwoodburn/firewallet-hsd:$tag
-          docker push git.woodburn.au/nathanwoodburn/firewallet-hsd:$tag

Dockerfile

@@ -21,7 +21,6 @@ LABEL org.opencontainers.image.title="FireWallet" \
       org.opencontainers.image.source="https://git.woodburn.au/nathanwoodburn/firewalletbrowser" \
       org.opencontainers.image.version="2.0.0" \
       org.opencontainers.image.created=$BUILD_DATE \
-      org.opencontainers.image.revision=$VCS_REF \
       org.opencontainers.image.licenses="AGPL-3.0-only"
 
 ENTRYPOINT ["python3"]

Dockerfile.hsd

@@ -46,7 +46,6 @@ LABEL org.opencontainers.image.title="FireWallet (HSD)" \
       org.opencontainers.image.source="https://git.woodburn.au/nathanwoodburn/firewalletbrowser" \
       org.opencontainers.image.version="2.0.0" \
       org.opencontainers.image.created=$BUILD_DATE \
-      org.opencontainers.image.revision=$VCS_REF \
       org.opencontainers.image.licenses="AGPL-3.0-only"
 
 

docker-compose-internal.yml

@@ -1,6 +1,6 @@
 services:
   firewallet:
-    image: firewallet-hsd:latest
+    image: git.woodburn.au/nathanwoodburn/firewallet-hsd:latest
     ports:
       - "5000:5000"
     volumes: