From 1dc856061827f1a9e42b5fc47f5dee3e5ab04091 Mon Sep 17 00:00:00 2001 From: Daniel Hiller Date: Thu, 14 Sep 2023 01:27:29 +0200 Subject: [PATCH] chore: fix docker dev build --- .../build-and-push-docker-image-arm-dev.yml | 34 ------------------- ...ml => build-and-push-docker-image-dev.yml} | 6 ++-- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/build-and-push-docker-image-arm-dev.yml rename .github/workflows/{build-and-push-docker-image-amd64-dev.yml => build-and-push-docker-image-dev.yml} (84%) diff --git a/.github/workflows/build-and-push-docker-image-arm-dev.yml b/.github/workflows/build-and-push-docker-image-arm-dev.yml deleted file mode 100644 index 2ab356fa..00000000 --- a/.github/workflows/build-and-push-docker-image-arm-dev.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Build and push Docker DEV image arm - -on: - push: - branches: [master] - -jobs: - build-and-push-docker-image-dev-arm: - runs-on: self-hosted - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: . - platforms: linux/arm64,linux/arm/v7 - push: true - tags: | - ghcr.io/plankanban/planka:dev diff --git a/.github/workflows/build-and-push-docker-image-amd64-dev.yml b/.github/workflows/build-and-push-docker-image-dev.yml similarity index 84% rename from .github/workflows/build-and-push-docker-image-amd64-dev.yml rename to .github/workflows/build-and-push-docker-image-dev.yml index 5369cfe5..88027278 100644 --- a/.github/workflows/build-and-push-docker-image-amd64-dev.yml +++ b/.github/workflows/build-and-push-docker-image-dev.yml @@ -1,11 +1,11 @@ -name: Build and push Docker DEV image amd64 +name: Build and push Docker DEV image on: push: branches: [master] jobs: - build-and-push-docker-image-dev-amd64: + build-and-push-docker-image-dev: runs-on: self-hosted steps: - name: Checkout @@ -28,7 +28,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: | ghcr.io/plankanban/planka:dev