Use docker buildx

Author: williamdes

.github/workflows/build.yml

@@ -5,8 +5,17 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - name: Checkout repository
+              uses: actions/checkout@v3
+            # https://github.com/docker/setup-qemu-action
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v1
+            # https://github.com/docker/setup-buildx-action
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v1
             - name: Build image
               run: make docker-build
+              env:
+                  DOCKER_BUILDKIT: 1
             - name: Test image
               run: make test

.github/workflows/publish.yml

@@ -1,27 +1,35 @@
 name: Publish Docker image
 on:
-  release:
-    types: [published]
+    release:
+        types: [published]
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Packages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-      - name: Login to GitHub registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+    push_to_registry:
+        name: Push Docker image to GitHub Packages
+        runs-on: ubuntu-latest
+        steps:
+            - name: Check out the repo
+              uses: actions/checkout@v3
+            # https://github.com/docker/setup-qemu-action
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v1
+            # https://github.com/docker/setup-buildx-action
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v1
+            - name: Login to GitHub registry
+              uses: docker/login-action@v1
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.repository_owner }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build image
-        run: IMAGE_TAG="ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin" make docker-build
+            - name: Build image
+              run: IMAGE_TAG="ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin" make docker-build
+              env:
+                  DOCKER_BUILDKIT: 1
 
-      - name: Test image
-        run: IMAGE_TAG="ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin" make docker-test
+            - name: Test image
+              run: IMAGE_TAG="ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin" make docker-test
 
-      - name: Push to GitHub Packages
-        run: docker push ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin:latest
+            - name: Push to GitHub Packages
+              run: docker push ghcr.io/sudo-bot/docker-phpldapadmin/docker-phpldapadmin:latest

Makefile

@@ -1,17 +1,27 @@
 IMAGE_TAG ?= docker-phpldapadmin
 TEST_ADDR ?= phpldapadmin
+# All: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
+PLATFORM ?= linux/amd64
+
+ACTION ?= load
+PROGRESS_MODE ?= plain
 
 .PHONY: docker-build docker-test run-test cleanup-test test
 
 all: docker-build docker-test
 
 docker-build:
-	docker build ./docker \
+	# https://github.com/docker/buildx#building
+	docker buildx build \
 		--build-arg VCS_REF=`git rev-parse HEAD` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		--build-arg RUST_PYTHON_VERSION=`docker run -q --rm dclong/rustpython:alpine --version | cut -d ' ' -f 2` \
 		--tag $(IMAGE_TAG) \
-		--pull
+		--progress $(PROGRESS_MODE) \
+		--platform $(PLATFORM) \
+		--pull \
+		--$(ACTION) \
+		./docker
 
 docker-test: test