From e0c63a165774c69ab20206f3d7e78e9858b1e2f1 Mon Sep 17 00:00:00 2001
From: gyurix <gyurix@gmail.com>
Date: Wed, 3 Jul 2024 10:54:26 +0200
Subject: [PATCH] added multiarch creation and replaced docker to docker-cli

---
 .drone.yml | 14 ++++++++++++--
 Dockerfile |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7872888..516d30d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,8 +18,18 @@ steps:
     image: plugins/docker
     commands:
       - cd /drone/src/
-      - docker build --platform linux/amd64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile .
-      - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}
+      - export DOCKER_CLI_EXPERIMENTAL=enabled
+      - docker build --platform linux/amd64 --tag $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/amd64 -f Dockerfile .
+      - docker build --platform linux/arm64/v8 --tag $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/arm64 -f Dockerfile .
+      - docker push $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/amd64 
+      - docker push $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/arm64
+      - |
+        docker manifest create $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME} \
+        $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/amd64 \
+        $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/arm64
+      - docker manifest annotate --arch arm64 --variant v8 $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME} $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}/linux/arm64
+      - docker manifest push $${DOCKER_REGISTRY_URL}/$${IMAGE_NAME}
+
     when:
       branch:
         - main
diff --git a/Dockerfile b/Dockerfile
index a62943e..354ad3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,9 @@ RUN apk --no-cache add php${PHP_VERSION} \
     php${PHP_VERSION}-fpm \
     php${PHP_VERSION}-curl \
     sudo \
-    docker
+    curl \
+    jq \
+    docker-cli
 
 COPY nginx.conf /etc/nginx/nginx.conf