From cc220d7517270f1cdb31f79d193a472b41792c3f Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:27:58 +0200 Subject: [PATCH 01/14] added multiplatform --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 71302f8..5d56284 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker build --platform linux/amd64, linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From a226e85de142d9f3d9167d32b8399fcee186de8d Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:29:38 +0200 Subject: [PATCH 02/14] corrected multiplatform --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5d56284..43d48a4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build --platform linux/amd64, linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker build -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile --platform linux/amd64,linux/arm64 . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From 0a4d02b778687612859199e97624d9d1b8eef99f Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:32:29 +0200 Subject: [PATCH 03/14] corrected --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 43d48a4..b885eb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile --platform linux/amd64,linux/arm64 . + - docker build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From 54121ee160c2c13bffa19ad5be5bf340153eb350 Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:33:34 +0200 Subject: [PATCH 04/14] test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b885eb6..53c6647 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker build --platform linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From 6c700228a51ab06be463e63a312ae6e0e63fa510 Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:34:35 +0200 Subject: [PATCH 05/14] testing --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 53c6647..073b601 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build --platform linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker build --platform linux/arm64 --platform linux/amd64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From 5b5075bdabff17e2ccfe1b542b61c59e81aa3aca Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:35:48 +0200 Subject: [PATCH 06/14] test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 073b601..334edfa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: image: plugins/docker commands: - cd /drone/src/ - - docker build --platform linux/arm64 --platform linux/amd64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker buildx build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: From e4eb277cc0eabef9743e220bfcccf8126e6ff901 Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:40:15 +0200 Subject: [PATCH 07/14] test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 334edfa..36a4e3b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ environment: steps: - name: build image - image: plugins/docker + image: plugins/drone-docker-buildx commands: - cd /drone/src/ - docker buildx build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . From 19da3b6fe0795364771c78e2bd8020361fd6478b Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:40:38 +0200 Subject: [PATCH 08/14] testing again --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 36a4e3b..f16ce1f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ environment: steps: - name: build image - image: plugins/drone-docker-buildx + image: plugins/docker-buildx commands: - cd /drone/src/ - docker buildx build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . From 2330e32aa6eca40db3063dcfab4a03474729360c Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:43:20 +0200 Subject: [PATCH 09/14] testing --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f16ce1f..2150240 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ environment: steps: - name: build image - image: plugins/docker-buildx + image: thegeeklab/drone-docker-buildx commands: - cd /drone/src/ - docker buildx build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . From 2f3fd8af8ecacf34ee9d8fb72411e0d5516cefc4 Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:48:38 +0200 Subject: [PATCH 10/14] testing --- .drone.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2150240..9905635 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,11 +15,13 @@ environment: steps: - name: build image - image: thegeeklab/drone-docker-buildx + image: plugin/docker commands: - cd /drone/src/ - - docker buildx build --platform linux/amd64,linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} + - docker build --platform linux/amd64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:amd64 -f Dockerfile . + - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:amd64 + - docker build --platform linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:arm64 -f Dockerfile . + - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:arm64 when: branch: - main From 50a411feab96e911233ea0460a19a85b52ec405e Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 28 Jun 2024 12:50:36 +0200 Subject: [PATCH 11/14] testing --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9905635..8ad04c2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ environment: steps: - name: build image - image: plugin/docker + image: plugins/docker commands: - cd /drone/src/ - docker build --platform linux/amd64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:amd64 -f Dockerfile . From ab5ca570b7f029d38c4b39a1f44daee102f1f628 Mon Sep 17 00:00:00 2001 From: shatnord Date: Fri, 28 Jun 2024 10:56:04 +0000 Subject: [PATCH 12/14] Update .drone.yml --- .drone.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8ad04c2..be27ae9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,13 +15,12 @@ environment: steps: - name: build image - image: plugins/docker + image: thegeeklab/drone-docker-buildx commands: - cd /drone/src/ - - docker build --platform linux/amd64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:amd64 -f Dockerfile . - - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:amd64 - - docker build --platform linux/arm64 -t $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:arm64 -f Dockerfile . - - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME}:arm64 + - docker buildx create --name mybuilder --use --bootstrap + - docker buildx build --platform linux/amd64,linux/arm64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: - main From fcb5ec65f9985b19e06c41c537786870b02b2fe9 Mon Sep 17 00:00:00 2001 From: Gyorgy Berenyi Date: Fri, 28 Jun 2024 14:45:12 +0000 Subject: [PATCH 13/14] Update nginx.conf --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index f860c68..8429ce1 100644 --- a/nginx.conf +++ b/nginx.conf @@ -27,7 +27,7 @@ http { server_name localhost; location / { root /usr/share/nginx/html; - index index.html + index index.html; } error_page 500 502 503 504 /50x.html; From ffd6bde25c8dad2c58255fbb07c6d8693847a0a1 Mon Sep 17 00:00:00 2001 From: Gyorgy Berenyi Date: Fri, 28 Jun 2024 14:46:32 +0000 Subject: [PATCH 14/14] Update .drone.yml --- .drone.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index be27ae9..7872888 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,11 +15,10 @@ environment: steps: - name: build image - image: thegeeklab/drone-docker-buildx + image: plugins/docker commands: - cd /drone/src/ - - docker buildx create --name mybuilder --use --bootstrap - - docker buildx build --platform linux/amd64,linux/arm64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . + - docker build --platform linux/amd64 --tag $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} -f Dockerfile . - docker push $${REGISTRY_SERVER_NAME}/$${IMAGE_NAME} when: branch: