From 737c339f650e42e36fbc177d8324da46a2056d70 Mon Sep 17 00:00:00 2001 From: tagyoureit Date: Sat, 20 Apr 2024 08:25:16 -0700 Subject: [PATCH] single github action command --- .../workflows/docker-publish-njsPC-linux.yml | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-publish-njsPC-linux.yml b/.github/workflows/docker-publish-njsPC-linux.yml index daa06b81..8c9c3d75 100644 --- 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