Merge pull request #347 from wearefuturegov/feature/disable-multi-pla…

…tform Disable multi platform builds
wearefuturegov · Jun 14, 2024 · b948b36 · b948b36
2 parents b490449 + 5615168
commit b948b36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 36 deletions.
diff --git a/.github/workflows/publish-outpost-image.yml b/.github/workflows/publish-outpost-image.yml
@@ -6,12 +6,13 @@ on:
   push:
     branches: [develop, staging, production]
 
+# multi platform  builds are disabled until we upgrade to a newer version of heroku stack
 jobs:
   push-outpost-image:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platforms: ["linux/amd64"]
+    # strategy:
+    #   matrix:
+    #     platforms: ["linux/amd64"]
     steps:
       - name: "Checkout GitHub Action"
         uses: actions/checkout@main
@@ -37,19 +38,19 @@ jobs:
             echo "tag=default" >> $GITHUB_ENV
           fi
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
       - name: Build and push outpost docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           tags: ghcr.io/wearefuturegov/outpost:${{ env.tag }}
           file: Dockerfile.production
-          platforms: ${{ matrix.platforms }}
+          # platforms: ${{ matrix.platforms }}
           push: true
           outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Outpost image
           labels: org.opencontainers.image.source=https://github.com/wearefuturegov/outpost
diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml
@@ -28,12 +28,6 @@ jobs:
             echo "tag=default" >> $GITHUB_ENV
           fi
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build Docker image
         uses: docker/build-push-action@v5
         with:

diff --git a/.github/workflows/test-in-herokuish.yml b/.github/workflows/test-in-herokuish.yml
@@ -1,5 +1,3 @@
-# @TODO fix static files not generating in this image
-
 # RAILS_ENV: test
 # NODE_ENV: development
 # test_mongo_local_db_uri="mongodb://$(test_mongo_db_user):$(test_mongo_db_password)@localhost:$(test_mongo_port)/$(test_mongo_db_name)"
@@ -66,26 +64,10 @@ jobs:
           -e POSTGRES_USER=$test_postgres_db_user \
           postgres:13.7-alpine
 
-        # options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-      # - name: "Login to GitHub Container Registry"
-      #   uses: docker/login-action@v3
-      #   with:
-      #     registry: ghcr.io
-      #     username: ${{github.actor}}
-      #     password: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          # tags: ghcr.io/wearefuturegov/outpost:test
           tags: outpost:test
           file: Dockerfile.test
           load: true
@@ -101,10 +83,6 @@ jobs:
             NODE_ENV=test
             NODE_MODULES_CACHE=true
 
-      # - name: Test
-      #   run: |
-      #     docker run --rm outpost:test
-
       - name: Run the image and tests
         run: |
           docker run --rm --name test_container \