Merge pull request #1018 from guydavis/integration

Fix issues with arm64
guydavis · Feb 17, 2025 · b8710e9 · b8710e9
2 parents 29ca45e + 20a2642
commit b8710e9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout

diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:latest
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -72,7 +72,7 @@ jobs:
         with:
           file: docker/dockerfile-jammy.base
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           tags: |

diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml
@@ -38,7 +38,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           build-args: |

diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
@@ -42,7 +42,7 @@ jobs:
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:test
 
   docker-jammy:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -72,7 +72,7 @@ jobs:
         with:
           file: docker/dockerfile-jammy.base
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           tags: |

diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           provenance: false
           push: true
           build-args: |