From 5fd9616b5f4b87392f5e16eed9159be060f3c6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= Date: Thu, 11 Nov 2021 15:57:06 +0100 Subject: [PATCH] Add ARM image for Docker to CI --- .github/workflows/publish-docker-latest.yml | 31 ++++++++++------- .github/workflows/publish-docker-tag.yml | 38 +++++++++++++++------ 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/.github/workflows/publish-docker-latest.yml b/.github/workflows/publish-docker-latest.yml index 967248a07..4fdeed165 100644 --- a/.github/workflows/publish-docker-latest.yml +++ b/.github/workflows/publish-docker-latest.yml @@ -6,17 +6,24 @@ on: name: Publish latest image to Docker Hub jobs: - build: - runs-on: ubuntu-18.04 + docker-latest: + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - name: Check if current release is latest - run: echo "##[set-output name=is_latest;]$(sh .github/is-latest-release.sh)" - id: release - - name: Publish to Registry - if: steps.release.outputs.is_latest == 'true' - uses: elgohr/Publish-Docker-Github-Action@master + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to DockerHub + uses: docker/login-action@v1 with: - name: getmeili/meilisearch - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: getmeili/meilisearch:latest diff --git a/.github/workflows/publish-docker-tag.yml b/.github/workflows/publish-docker-tag.yml index 559a84f31..6901b46c9 100644 --- a/.github/workflows/publish-docker-tag.yml +++ b/.github/workflows/publish-docker-tag.yml @@ -7,16 +7,32 @@ on: name: Publish tagged image to Docker Hub jobs: - build: - runs-on: ubuntu-18.04 + docker-tag: + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - env: - COMMIT_SHA: ${{ github.sha }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 with: - name: getmeili/meilisearch - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - tag_names: true + images: name/app + flavor: latest=false + tags: type=ref,event=tag + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: ${{ steps.meta.outputs.tags }}