single github action command

tagyoureit · Apr 20, 2024 · 737c339 · 737c339
1 parent 3015067
commit 737c339
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/.github/workflows/docker-publish-njsPC-linux.yml b/.github/workflows/docker-publish-njsPC-linux.yml
@@ -27,24 +27,34 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          
-      - name: Build and push njsPC Linux Docker image (x86_64)
+
+      - name: Build and push combined Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./.docker/Dockerfile.linux
+          file: ./Dockerfile
           push: true
           tags: |
-            tagyoureit/nodejs-poolcontroller:latest
+            tagyoureit/njspc-njspcdp-combined-app: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 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