✨ Add support for multiarch builds, including ARM (e.g. Mac M1) (#200)

.github/workflows/deploy.yml

@@ -9,7 +9,7 @@ on:
     - cron: "0 0 * * 1"
 
 jobs:
-  build:
+  deploy:
     strategy:
       matrix:
         image:
@@ -28,24 +28,35 @@ jobs:
       fail-fast: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - name: Set Dockerfile name
+        if: matrix.image.name != 'latest'
+        run: echo "DOCKERFILE_NAME=${{ matrix.image.name }}" >> $GITHUB_ENV
+      - name: Set Dockerfile name latest
+        if: matrix.image.name == 'latest'
+        run: echo "DOCKERFILE_NAME=python${{ matrix.image.python_version }}" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          python-version: "3.7"
-      - name: Install Dependencies
-        run: python3.7 -m pip install docker pytest
-      - name: Deploy Image
-        run: bash scripts/build-push.sh
-        env:
-          NAME: ${{ matrix.image.name }}
-          DOCKERFILE: ${{ matrix.image.dockerfile }}
-          PYTHON_VERSION: ${{ matrix.image.python_version }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          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/uwsgi-nginx:${{ matrix.image.name }}
+            tiangolo/uwsgi-nginx:${{ matrix.image.name }}-${{ env.DATE_TAG }} 
+          context: ./docker-images/
+          file: ./docker-images/${{ env.DOCKERFILE_NAME }}.dockerfile
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: tiangolo/uwsgi-nginx

.github/workflows/test.yml

@@ -13,7 +13,7 @@ on:
     - cron: "0 0 * * 1"
 
 jobs:
-  build:
+  test:
     strategy:
       matrix:
         image:
@@ -32,30 +32,36 @@ jobs:
       fail-fast: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4
+      - name: Set Dockerfile name
+        if: matrix.image.name != 'latest'
+        run: echo "DOCKERFILE_NAME=${{ matrix.image.name }}" >> $GITHUB_ENV
+      - name: Set Dockerfile name latest
+        if: matrix.image.name == 'latest'
+        run: echo "DOCKERFILE_NAME=python${{ matrix.image.python_version }}" >> $GITHUB_ENV
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          push: false
+          tags: tiangolo/uwsgi-nginx:${{ matrix.image.name }}
+          context: ./docker-images/
+          file: ./docker-images/${{ env.DOCKERFILE_NAME }}.dockerfile
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
-      - name: Install poetry
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install poetry
-      - name: Configure poetry
-        run: python -m poetry config virtualenvs.create false
+          python-version: "3.10"
       - name: Install Dependencies
-        run: python -m poetry install
+        run: python -m pip install docker pytest
       - name: Test Image
-        run: python -m poetry run bash scripts/test.sh
+        run: bash scripts/test.sh
         env:
           NAME: ${{ matrix.image.name }}
-          DOCKERFILE: ${{ matrix.image.dockerfile }}
           PYTHON_VERSION: ${{ matrix.image.python_version }}
           SLEEP_TIME: "5"
   check:
     if: always()
     needs:
-    - build
+    - test
     runs-on: ubuntu-latest
     steps:
     - name: Decide whether the needed jobs succeeded or failed

scripts/test.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-bash scripts/build.sh
 pytest tests "$@"