From 6202b18106625e351cf1bfb8ad26982686b62610 Mon Sep 17 00:00:00 2001 From: Nikita Gusakov Date: Mon, 16 Oct 2023 17:05:40 +0200 Subject: [PATCH] upgrade github actions & enable arm builds --- .github/workflows/docker-image-testing.yml | 17 ++++++++++++----- .github/workflows/docker-image.yml | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-image-testing.yml b/.github/workflows/docker-image-testing.yml index e91027a..00ae528 100644 --- a/.github/workflows/docker-image-testing.yml +++ b/.github/workflows/docker-image-testing.yml @@ -2,9 +2,9 @@ name: Build and push pgtuned images on: push: - branches: [ dev ] + branches: [dev] pull_request: - branches: [ dev ] + branches: [dev] jobs: build: @@ -83,19 +83,26 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@v1.12.0 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_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@v2.9.0 + uses: docker/build-push-action@v5 with: context: . push: true + platforms: linux/amd64,linux/arm64 build-args: | POSTGRES_VERSION=${{ matrix.postgres_version }} POSTGIS_VERSION=${{ matrix.postgis_version }} diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 388a698..754d440 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,9 +2,9 @@ name: Build and push pgtuned images on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] jobs: build: @@ -83,19 +83,26 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@v1.12.0 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_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@v2.9.0 + uses: docker/build-push-action@v5 with: context: . push: true + platforms: linux/amd64,linux/arm64 build-args: | POSTGRES_VERSION=${{ matrix.postgres_version }} POSTGIS_VERSION=${{ matrix.postgis_version }}