Skip to content

Commit

Permalink
Merge pull request #428 from neilcook/multi_arch
Browse files Browse the repository at this point in the history
Fix multi-arch build issue
  • Loading branch information
neilcook authored Jun 6, 2024
2 parents 59ef3e0 + 6696120 commit 97ef80a
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/docker-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: 'Build minimal docker image'

on:
push:
pull_request:

jobs:
docker_test:
Expand All @@ -30,18 +29,18 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
platforms: ${{ env.PLATFORMS }}
- name: Login to Docker
if: github.event_name != 'pull_request' && github.event_name != 'push'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Check for release tag
id: release_check
run: |
if [[ ${{ github.ref }} =~ ^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "release=YES" >> $GITHUB_OUTPUT
fi
- name: Login to Docker
if: steps.release_check.outputs.release == 'YES' || env.BRANCH_NAME == 'master'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push to docker hub for releases with tag
id: release_build
if: ${{ steps.release_check.outputs.release == 'YES' }}
Expand Down

0 comments on commit 97ef80a

Please sign in to comment.