From cbe32b8de9768812f255beea81543e4079149f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Sun, 17 Mar 2024 19:33:55 -0500
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Add=20support=20for=20multiarch?=
 =?UTF-8?q?=20builds,=20including=20ARM=20(e.g.=20Mac=20M1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 29 ++++++++++++++++++++---------
 .github/workflows/test.yml   | 12 +++++++-----
 scripts/build-push.sh        | 15 ---------------
 scripts/build.sh             |  6 ------
 scripts/docker-login.sh      |  5 -----
 5 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 scripts/build-push.sh
 delete mode 100644 scripts/build.sh
 delete mode 100644 scripts/docker-login.sh

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d0f3762..1f6d4db 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 327aed0..8629507 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,18 +13,20 @@ on:
     - cron: "0 0 * * 1"
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - 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
diff --git a/scripts/build-push.sh b/scripts/build-push.sh
deleted file mode 100644
index 6653cdb..0000000
--- a/scripts/build-push.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-use_tag="tiangolo/nginx-rtmp:$NAME"
-use_dated_tag="${use_tag}-$(date -I)"
-
-bash scripts/build.sh
-
-docker tag "$use_tag" "$use_dated_tag"
-
-bash scripts/docker-login.sh
-
-docker push "$use_tag"
-docker push "$use_dated_tag"
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100644
index 1ee0a9b..0000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-use_tag="tiangolo/nginx-rtmp:$NAME"
-
-docker build -t "$use_tag" .
diff --git a/scripts/docker-login.sh b/scripts/docker-login.sh
deleted file mode 100644
index d872c89..0000000
--- a/scripts/docker-login.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

From 0b7e457fa6a31f4683147d5fee62c83b99bdb4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Sun, 17 Mar 2024 19:35:24 -0500
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=91=B7=20Update=20CI=20for=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8629507..17b7c02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Build Image
         uses: docker/build-push-action@v2
         with: