fix: update docker meta

macite · Jun 5, 2021 · b932e00 · b932e00
1 parent a087b55
commit b932e00
Showing 1 changed file with 50 additions and 49 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -6,51 +6,51 @@ on:
     tags:
       - 'v*.*.*'
 jobs:
-  docker-webserver:
-    environment: deployment-secrets
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: Build local webserver container
-        uses: docker/build-push-action@v2
-        with:
-          context: ./doubtfire-web
-          push: false
-          tags: doubtfire-web:latest
-      - name: Build web application
-        uses: addnab/docker-run-action@v3
-        with:
-          image: doubtfire-web:latest
-          options: -v ${{ github.workspace }}/doubtfire-web:/doubtfire-web --workdir /doubtfire-web 
-          run:  |
-            echo "Running Script"
-            npm install
-            npm run-script deploy
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Setup meta for webserver
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: lmsdoubtfire/webserver
-          tag-custom: latest
-          tag-semver: |
-            {{raw}}
-      - name: Build and push webserver
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: webserver.Dockerfile
-          push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+  # docker-webserver:
+  #   environment: deployment-secrets
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v2
+  #     - name: Checkout submodules
+  #       run: git submodule update --init --recursive
+  #     - name: Build local webserver container
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: ./doubtfire-web
+  #         push: false
+  #         tags: doubtfire-web:latest
+  #     - name: Build web application
+  #       uses: addnab/docker-run-action@v3
+  #       with:
+  #         image: doubtfire-web:latest
+  #         options: -v ${{ github.workspace }}/doubtfire-web:/doubtfire-web --workdir /doubtfire-web 
+  #         run:  |
+  #           echo "Running Script"
+  #           npm install
+  #           npm run-script deploy
+  #     - name: Login to DockerHub
+  #       uses: docker/login-action@v1
+  #       with:
+  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
+  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
+  #     - name: Setup meta for webserver
+  #       id: docker_meta
+  #       uses: docker/metadata-action@v3
+  #       with:
+  #         images: lmsdoubtfire/webserver
+  #         tag-custom: latest
+  #         tag-semver: |
+  #           {{raw}}
+  #     - name: Build and push webserver
+  #       id: docker_build
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         file: webserver.Dockerfile
+  #         push: true
+  #         tags: ${{ steps.docker_meta.outputs.tags }}
+  #     - name: Image digest
+  #       run: echo ${{ steps.docker_build.outputs.digest }}
   docker-pdfGen:
     environment: deployment-secrets
     runs-on: ubuntu-latest
@@ -69,14 +69,15 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: lmsdoubtfire/pdfGen
-          tag-custom: latest
-          tag-semver: |
-            {{raw}}
+          tag: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
       - name: Build and push pdfGen
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          file: pdfGen.Dockerfile
+          context: .
+          file: ./pdfGen.Dockerfile
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
       - name: Image digest