replace standard builders with multi-arch version

gofractally · Jul 20, 2023 · 52f139f · 52f139f
1 parent e67861e
commit 52f139f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 159 deletions.
diff --git a/.github/workflows/ubuntu-2004-builder.yml b/.github/workflows/ubuntu-2004-builder.yml
@@ -7,12 +7,12 @@ on:
       - main
       - "release/*"
     paths:
-      - "docker/ubuntu-2004-builder.Dockerfile"
+      - "docker/ubuntu-builder/ubuntu-2004-builder.Dockerfile"
       - ".github/workflows/ubuntu-2004-builder.yml"
   pull_request:
     types: [assigned, opened, synchronize, reopened, labeled]
     paths:
-      - "docker/ubuntu-2004-builder.Dockerfile"
+      - "docker/ubuntu-builder/ubuntu-2004-builder.Dockerfile"
       - ".github/workflows/ubuntu-2004-builder.yml"
 
 jobs:
@@ -60,7 +60,7 @@ jobs:
         with:
           context: .
           push: true
-          file: docker/ubuntu-2004-builder.Dockerfile
+          file: docker/ubuntu-builder/ubuntu-2004-builder.Dockerfile
           tags: ${{ steps.prep.outputs.tags }}
           platforms: linux/amd64,linux/arm64
           outputs: type=image,annotation-index.org.opencontainers.image.description=Psibase build environment based on Ubuntu 20.04 (image support for arm64 and amd64)
diff --git a/.github/workflows/ubuntu-2204-builder.yml b/.github/workflows/ubuntu-2204-builder.yml
@@ -7,12 +7,12 @@ on:
       - main
       - "release/*"
     paths:
-      - "docker/ubuntu-2204-builder.Dockerfile"
+      - "docker/ubuntu-builder/ubuntu-2204-builder.Dockerfile"
       - ".github/workflows/ubuntu-2204-builder.yml"
   pull_request:
     types: [assigned, opened, synchronize, reopened, labeled]
     paths:
-      - "docker/ubuntu-2204-builder.Dockerfile"
+      - "docker/ubuntu-builder/ubuntu-2204-builder.Dockerfile"
       - ".github/workflows/ubuntu-2204-builder.yml"
 
 jobs:
@@ -60,7 +60,7 @@ jobs:
         with:
           context: .
           push: true
-          file: docker/ubuntu-2204-builder.Dockerfile
+          file: docker/ubuntu-builder/ubuntu-2204-builder.Dockerfile
           tags: ${{ steps.prep.outputs.tags }}
           platforms: linux/amd64,linux/arm64
           outputs: type=image,annotation-index.org.opencontainers.image.description=Psibase build environment based on Ubuntu 22.04 (image support for arm64 and amd64)
diff --git a/docker/ubuntu-2004-builder.Dockerfile b/docker/ubuntu-2004-builder.Dockerfile
diff --git a/docker/ubuntu-2204-builder.Dockerfile b/docker/ubuntu-2204-builder.Dockerfile
diff --git a/...ubuntu-2004-builder_multi-arch.Dockerfile → ...tu-builder/ubuntu-2004-builder.Dockerfile b/...ubuntu-2004-builder_multi-arch.Dockerfile → ...tu-builder/ubuntu-2004-builder.Dockerfile
diff --git a/...ubuntu-2204-builder_multi-arch.Dockerfile → ...tu-builder/ubuntu-2204-builder.Dockerfile b/...ubuntu-2204-builder_multi-arch.Dockerfile → ...tu-builder/ubuntu-2204-builder.Dockerfile