Cleaned up docker workflow

tagyoureit · Jul 15, 2024 · fd870f7 · fd870f7
1 parent d3bb56c
commit fd870f7
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 342 deletions.
diff --git a/.docker/Dockerfile.armv6 b/.docker/Dockerfile.armv6
diff --git a/.docker/Dockerfile.armv7 b/.docker/Dockerfile.armv7
diff --git a/.docker/Dockerfile.linux b/.docker/Dockerfile.linux
diff --git a/.docker/Dockerfile.windows b/.docker/Dockerfile.windows
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
diff --git a/.docker/ecosystem.config.js b/.docker/ecosystem.config.js
diff --git a/.github/workflows/docker-publish-njsPC-linux.yml b/.github/workflows/docker-publish-njsPC-linux.yml
@@ -11,71 +11,22 @@ 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
-        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
+      - 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
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           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
diff --git a/.github/workflows/docker-publish-njsPC-windows.yml b/.github/workflows/docker-publish-njsPC-windows.yml
diff --git a/Dockerfile b/Dockerfile
@@ -15,4 +15,5 @@ WORKDIR /app
 COPY --chown=node:node --from=build /app .
 USER node
 ENV NODE_ENV=production
+EXPOSE 5150
 ENTRYPOINT ["node", "dist/app.js"]