From 06ca83bb58225c02ff1c29a63e46e094f04037ae Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Tue, 1 Nov 2022 21:39:50 +0100
Subject: [PATCH] try multiple tags

---
 .github/workflows/trial.yml | 33 ++++++++++++++++++++++++++-------
 tags/index.js               | 13 ++++++++-----
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/trial.yml b/.github/workflows/trial.yml
index 6bf3385..a221561 100644
--- a/.github/workflows/trial.yml
+++ b/.github/workflows/trial.yml
@@ -37,16 +37,35 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           install: true
-      # - name: Login to DockerHub
-      #   uses: docker/login-action@v1
-      #   with:
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker Labels
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            cupcakearmy/breitbandbot
+            ghcr.io/${{ github.repository }}
+          tags: ${{ matrix.tags }}
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: false
           build-args: NGINX=${{ matrix.version }}
-          tags: cupcakearmy/static:${{ matrix.tag }},ghcr.io/${{ github.repository }}:${{ matrix.tag }}
+          tags: ${{ steps.meta.outputs.tags }}
+          # tags: cupcakearmy/static:${{ matrix.tag }},ghcr.io/${{ github.repository }}:${{ matrix.tag }}
diff --git a/tags/index.js b/tags/index.js
index 10f8c35..f133bf4 100644
--- a/tags/index.js
+++ b/tags/index.js
@@ -18,17 +18,20 @@ const versions = matches.map(clean)
 const filtered = versions.sort(semver.rcompare).slice(0, 2)
 
 // Map the docker tags to the versions
-const tagsMap = Object.fromEntries(filtered.map((v) => [v, v]))
+// const tagsMap = Object.fromEntries(filtered.map((v) => [v, v]))
 
 // Add the mainline, stable and latests tags
-tagsMap['latest'] = versions[0]
-tagsMap['mainline'] = versions[0]
-tagsMap['stable'] = versions[1]
+// tagsMap['latest'] = versions[0]
+// tagsMap['mainline'] = versions[0]
+// tagsMap['stable'] = versions[1]
 
 // Export as github action matrix
 // https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
 const githubActionMatrix = {
-  include: Object.entries(tagsMap).map(([tag, version]) => ({ tag, version })),
+  include: [
+    { version: filtered[0], tags: ['latest', 'mainline', filtered[0]] },
+    { version: filtered[1], tags: ['stable', filtered[1]] },
+  ],
 }
 
 const serialised = JSON.stringify(githubActionMatrix)