main (Flagsmith#1998)

interactio · Mar 6, 2023 · 6bd4685 · 6bd4685
1 parent c2ad44c
commit 6bd4685
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 54 deletions.
diff --git a/.github/workflows/api-docker-publish-image.yml b/.github/workflows/api-docker-publish-image.yml
@@ -44,21 +44,11 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - name: Build and push amd64 images
-              id: docker_build_amd64
+            - name: Build and push images
+              id: docker_build
               uses: docker/build-push-action@v3
               with:
-                  platforms: linux/amd64
-                  file: api/Dockerfile
-                  context: api/
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-
-            - name: Build and push arm64 images
-              id: docker_build_arm64
-              uses: docker/build-push-action@v3
-              with:
-                  platforms: linux/arm64
+                  platforms: linux/amd64,linux/arm64
                   file: api/Dockerfile
                   context: api/
                   push: true

diff --git a/.github/workflows/frontend-docker-publish-image.yml b/.github/workflows/frontend-docker-publish-image.yml
@@ -50,21 +50,11 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - name: Build and push amd64 images
-              id: docker_build_amd64
+            - name: Build and push images
+              id: docker_build
               uses: docker/build-push-action@v3
               with:
-                  platforms: linux/amd64
-                  file: frontend/Dockerfile
-                  context: frontend/
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-
-            - name: Build and push arm64 images
-              id: docker_build_arm64
-              uses: docker/build-push-action@v3
-              with:
-                  platforms: linux/arm64
+                  platforms: linux/amd64,linux/arm64
                   file: frontend/Dockerfile
                   context: frontend/
                   push: true

diff --git a/.github/workflows/platform-docker-publish-all-features-image.yml b/.github/workflows/platform-docker-publish-all-features-image.yml
@@ -73,23 +73,11 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - name: Build and push amd64 images
-              id: docker_build_amd64
+            - name: Build and push images
+              id: docker_build
               uses: docker/build-push-action@v3
               with:
-                  platforms: linux/amd64
-                  file: Dockerfile
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-                  context: .
-                  build-args: |
-                      SAML_INSTALLED=1
-
-            - name: Build and push arm64 images
-              id: docker_build_arm64
-              uses: docker/build-push-action@v3
-              with:
-                  platforms: linux/arm64
+                  platforms: linux/amd64,linux/arm64
                   file: Dockerfile
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}

diff --git a/.github/workflows/platform-docker-publish-image.yml b/.github/workflows/platform-docker-publish-image.yml
@@ -41,21 +41,11 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - name: Build and push amd64 images
-              id: docker_build_amd64
+            - name: Build and push images
+              id: docker_build
               uses: docker/build-push-action@v3
               with:
-                  platforms: linux/amd64
-                  file: Dockerfile
-                  context: .
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-
-            - name: Build and push arm64 images
-              id: docker_build_arm64
-              uses: docker/build-push-action@v3
-              with:
-                  platforms: linux/arm64
+                  platforms: linux/amd64,linux/arm64
                   file: Dockerfile
                   context: .
                   push: true