Skip to content

Commit

Permalink
✨ Add support for multiarch builds, including ARM (e.g. Mac M1) (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
tiangolo committed Mar 18, 2024
1 parent 3830097 commit 3286a80
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 40 deletions.
29 changes: 20 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,30 @@ on:
- cron: "0 0 * * 1"

jobs:
build:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Deploy Image
run: bash scripts/build-push.sh
env:
NAME: latest
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Get date for tags
run: echo "DATE_TAG=$(date -I)" >> "$GITHUB_ENV"
- name: Build and push
uses: docker/build-push-action@v2
with:
push: true
platforms: linux/amd64,linux/arm64
tags: |
tiangolo/nginx-rtmp:${{ matrix.image.name }}
tiangolo/nginx-rtmp:${{ matrix.image.name }}-${{ env.DATE_TAG }}
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
repository: tiangolo/nginx-rtmp
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,22 @@ on:
- cron: "0 0 * * 1"

jobs:
build:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build Image
run: bash scripts/build.sh
env:
NAME: latest
uses: docker/build-push-action@v2
with:
push: false
tags: tiangolo/nginx-rtmp:latest
platforms: linux/amd64,linux/arm64
check:
if: always()
needs:
- build
- test
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
Expand Down
15 changes: 0 additions & 15 deletions scripts/build-push.sh

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/build.sh

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/docker-login.sh

This file was deleted.

0 comments on commit 3286a80

Please sign in to comment.