From 69449cf9efb418b3879a7f13ba20743350d9b06d Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Mon, 9 Jan 2023 06:36:36 +0200 Subject: [PATCH 1/3] Action try arm64 --- .github/workflows/build-old.yml | 68 +++++++++++++++++++++++++++++++++ .github/workflows/manual.yaml | 39 +------------------ 2 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/build-old.yml diff --git a/.github/workflows/build-old.yml b/.github/workflows/build-old.yml new file mode 100644 index 0000000..787f7cf --- /dev/null +++ b/.github/workflows/build-old.yml @@ -0,0 +1,68 @@ +name: ci +on: + push: + branches: + - master + +env: + BUILDKIT_IMAGE: jkaninda/laravel-php-fpm +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push 7.2 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.2/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.2" + - + name: Build and push 7.3 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.3/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.3" + - + name: Build and push 7.4 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.4/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.4" + - + name: Build and push 8.0 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.0/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.0" + - + name: Build and push 8.1 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.1/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.1" + - + name: Build and push 8.2 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.2/Dockerfile" + push: true + tags: | + "${{env.BUILDKIT_IMAGE}}:8.2" + "${{env.BUILDKIT_IMAGE}}:latest" \ No newline at end of file diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml index 2949100..5e5ca4d 100644 --- a/.github/workflows/manual.yaml +++ b/.github/workflows/manual.yaml @@ -25,44 +25,7 @@ jobs: uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push 7.2 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/7.2/Dockerfile" - push: true - tags: "${{env.BUILDKIT_IMAGE}}:7.2" - - - name: Build and push 7.3 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/7.3/Dockerfile" - push: true - tags: "${{env.BUILDKIT_IMAGE}}:7.3" - - - name: Build and push 7.4 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/7.4/Dockerfile" - push: true - tags: "${{env.BUILDKIT_IMAGE}}:7.4" - - - name: Build and push 8.0 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/8.0/Dockerfile" - #platforms: linux/amd64,linux/arm64 - push: true - tags: "${{env.BUILDKIT_IMAGE}}:8.0" - - - name: Build and push 8.1 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/8.1/Dockerfile" - #platforms: linux/amd64,linux/arm64 - push: true - tags: "${{env.BUILDKIT_IMAGE}}:8.1" + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push 8.2 uses: docker/build-push-action@v3 From 11a66aeb82e0d8172b645d1b42f8105a9055e4ad Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Mon, 9 Jan 2023 06:36:38 +0200 Subject: [PATCH 2/3] Action try arm64 --- .github/workflows/manual.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml index 5e5ca4d..be8102b 100644 --- a/.github/workflows/manual.yaml +++ b/.github/workflows/manual.yaml @@ -31,7 +31,7 @@ jobs: uses: docker/build-push-action@v3 with: file: "./src/docker/8.2/Dockerfile" - platforms: linux/amd64,linux/arm64 + platforms: linux/arm64 push: true tags: | "${{env.BUILDKIT_IMAGE}}:8.2" From ae45261a85cff683bf36c84668d70c562eb7a78a Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Mon, 9 Jan 2023 07:07:47 +0200 Subject: [PATCH 3/3] Refactoring --- .github/workflows/build.yml | 16 +------------- .github/workflows/manual.yaml | 40 ++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e3e307..3362fe1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,21 +22,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push 7.2 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/7.2/Dockerfile" - push: true - tags: "${{env.BUILDKIT_IMAGE}}:7.2" - - - name: Build and push 7.3 - uses: docker/build-push-action@v3 - with: - file: "./src/docker/7.3/Dockerfile" - push: true - tags: "${{env.BUILDKIT_IMAGE}}:7.3" - - + - name: Build and push 7.4 uses: docker/build-push-action@v3 with: diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml index be8102b..6875c37 100644 --- a/.github/workflows/manual.yaml +++ b/.github/workflows/manual.yaml @@ -1,4 +1,4 @@ -name: Build-manually +name: Manual-build on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -25,13 +25,47 @@ jobs: uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push 7.2 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.2/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.2" + - + name: Build and push 7.3 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.3/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.3" + - + name: Build and push 7.4 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.4/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.4" + - + name: Build and push 8.0 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.0/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.0" + - + name: Build and push 8.1 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.1/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.1" - name: Build and push 8.2 uses: docker/build-push-action@v3 with: file: "./src/docker/8.2/Dockerfile" - platforms: linux/arm64 push: true tags: | "${{env.BUILDKIT_IMAGE}}:8.2"