From 895467d31172d6b5aa8b47fee47f244fb2f0d7fe Mon Sep 17 00:00:00 2001
From: Luca Comellini <luca.com@gmail.com>
Date: Fri, 27 Aug 2021 20:22:37 -0700
Subject: [PATCH] Add Docker images for arm, arm64, ppc64le and s390x

---
 .circleci/config.yml         | 12 ------
 .github/dependabot.yml       |  4 ++
 .github/workflows/docker.yml | 75 ++++++++++++++++++++++++++++++++++++
 ci/do_ci.sh                  | 10 -----
 4 files changed, 79 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d17123d..86ce20c8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,15 +33,6 @@ jobs:
       - run: ./ci/install_gcc4.8.sh
       - run: ./ci/install_opentracing.sh
       - run: ./ci/do_ci.sh build
-  docker_image:
-    machine:
-      image: ubuntu-2004:202107-02
-    environment:
-      DOCKER_BUILDKIT: 1
-    steps:
-      - checkout
-      - run:
-          command: docker build -t opentracing/nginx-opentracing --target final .
   openresty_docker_image:
     machine: true
     steps:
@@ -131,9 +122,6 @@ workflows:
       - build_gcc48_opentracing_16:
           requires:
             - build_gcc48_opentracing_15
-      - docker_image:
-          requires:
-            - system_testing
       - openresty_docker_image:
           requires:
             - system_testing
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 397ea141..732cc9dd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 00000000..6faa1189
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,75 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+  pull_request:
+    branches:
+      - master
+
+env:
+  PLATFORMS: "linux/arm,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
+
+jobs:
+    build-docker:
+      name: Build Docker Image
+      runs-on: ubuntu-20.04
+      steps:
+        - name: Checkout Repository
+          uses: actions/checkout@v2
+
+        - name: Cache Docker layers
+          uses: actions/cache@v2
+          with:
+            path: /tmp/.buildx-cache
+            key: ${{ runner.os }}-buildx-${{ github.sha }}
+            restore-keys: |
+              ${{ runner.os }}-buildx-
+
+        - name: Output Variables
+          id: var
+          run: |
+            echo "::set-output name=nginx_version::$(grep -m1 'FROM nginx:' <Dockerfile | awk -F'[: ]' '{print $3}')"
+
+        - name: Setup QEMU
+          uses: docker/setup-qemu-action@v1
+          with:
+            platforms: arm,arm64,ppc64le,s390x
+          if: github.event_name != 'pull_request'
+
+        - name: Docker Buildx
+          uses: docker/setup-buildx-action@v1
+
+        - name: DockerHub Login
+          uses: docker/login-action@v1
+          with:
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+          if: github.event_name != 'pull_request'
+
+        - name: Docker meta
+          id: meta
+          uses: docker/metadata-action@v3
+          with:
+            images: opentracing/nginx-opentracing
+            tags: |
+              type=edge
+              type=ref,event=pr
+              type=semver,pattern={{version}}
+              type=raw,value=nginx-${{ steps.var.outputs.nginx_version }},enable=${{ contains(github.ref, 'refs/tags/') }}
+
+        - name: Build (and push if not PR)
+          uses: docker/build-push-action@v2
+          with:
+            pull: true
+            load: ${{ github.event_name == 'pull_request' }}
+            push: ${{ github.event_name != 'pull_request' }}
+            platforms: ${{ github.event_name != 'pull_request' && env.PLATFORMS || '' }}
+            tags: ${{ steps.meta.outputs.tags }}
+            labels: ${{ steps.meta.outputs.labels }}
+            cache-from: type=local,src=/tmp/.buildx-cache
+            cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+            target: final
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 7d9cfb88..d57464e9 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -28,16 +28,6 @@ elif [[ "$1" == "push_docker_image" ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   VERSION_TAG="$(git describe --abbrev=0 --tags)"
   VERSION="${VERSION_TAG/v/}"
-  # nginx
-  docker build -t opentracing/nginx-opentracing --target final .
-  docker tag opentracing/nginx-opentracing opentracing/nginx-opentracing:${VERSION}
-  docker push opentracing/nginx-opentracing:${VERSION}
-  docker tag opentracing/nginx-opentracing opentracing/nginx-opentracing:latest
-  docker push opentracing/nginx-opentracing:latest
-
-  NGINX_VERSION="$(grep -m1 'FROM nginx:' <Dockerfile | awk -F'[: ]' '{print $3}')"
-  docker tag opentracing/nginx-opentracing opentracing/nginx-opentracing:nginx-${NGINX_VERSION}
-  docker push opentracing/nginx-opentracing:nginx-${NGINX_VERSION}
 
   # openresty
   docker build -t opentracing/openresty -f Dockerfile-openresty .