Merge pull request #80 from Edirom/dev

Version 1.0.1
Edirom · Mar 15, 2023 · 88cd73c · 88cd73c
2 parents ba34722 + 984234c
commit 88cd73c
Show file tree

Hide file tree

Showing 5 changed files with 527 additions and 254 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -48,10 +48,25 @@ jobs:
             
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
+      # on main branch dont set Docker build ARG
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        if: ${{ github.ref != 'refs/heads/dev' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}         
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      # on main set Docker build ARG to use dev webservice
+      - name: Build and push Docker image
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VUE_APP_WEBSERVICE_URL=https://dev.meigarage.edirom.de/ege-webservice/