Merge pull request #1000 from treyrich/docker-cleanup

Docker cleanup and multiple platforms

.github/workflows/docker-publish-njsPC-linux.yml

@@ -4,78 +4,47 @@ on:
   push:
     branches:
       - master
-      - docker
+    tags:
+      - "v*.*.*"
   workflow_dispatch:
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Checkout code from tagyoureit/nodejs-poolcontroller
-        uses: actions/checkout@v3
-        with:
-          repository: tagyoureit/nodejs-poolcontroller
-          ref: master  # or specify the branch or tag to pull from
-          path: nodejs-poolcontroller
-
-      - name: Checkout code from rstrouse/nodejs-poolcontroller-dashpanel
-        uses: actions/checkout@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          repository: rstrouse/nodejs-poolcontroller-dashpanel  # 
-          ref: master  # Specify the branch or tag to pull from
-          path: nodejs-poolcontroller-dashpanel  # Specify the directory to checkout the code into
-
+          # list of Docker images to use as base name for tags
+          images: |
+            tagyoureit/njspc          
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push combined Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
-          context: .
-          file: ./.docker/Dockerfile.linux
           push: true
-          tags: |
-            tagyoureit/njspc-dp-combined-app:latest
-        
-
-      # - name: Build and push njsPC Linux Docker image (x86_64)
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.linux
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller:latest
-
-      # - name: Build and push njsPC-dP Linux Docker image (x86_64)
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: nodejs-poolcontroller-dashpanel
-      #     file: ./.docker/Dockerfile.linux
-      #     push: true
-      #     tags: |
-      #       rstrouse/nodejs-poolcontroller-dashpanel:latest
-
-      # - name: Build and push ARMv7 Docker image
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.armv7  # Adjust the path to your ARMv7 Dockerfile
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller-armv7:latest
-
-      # - name: Build and push ARMv6 Docker image
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.armv6  # Adjust the path to your ARMv6 Dockerfile
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller-armv6:latest
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}