From b7925d58038ada919d55bc023b0be170339d6656 Mon Sep 17 00:00:00 2001 From: giles Date: Fri, 16 Jun 2023 12:42:42 +0100 Subject: [PATCH] . --- .drone/drone-home.yml | 14 +++++++------- docker-compose.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index fca4a94..cd71062 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -50,7 +50,7 @@ "commands": [ "set -e", "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n", - "n=0\nwhile :\ndo\n docker pull drone/drone:2.4.0@sha256:8c1c83ed0f68b00e16ca50b8769e6cf7ccb3c5ff390036eaec7e5fcb79c3cb92 \\\\\n && docker tag drone/drone:2.4.0@sha256:8c1c83ed0f68b00e16ca50b8769e6cf7ccb3c5ff390036eaec7e5fcb79c3cb92 $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 \\\\\n && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 && break\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"initialise failed\"\n exit 1\n fi\n echo \"retrying..$n\"\n sleep 5\ndone\n" + "n=0\nwhile :\ndo\n docker pull drone/drone:2.17.0@sha256:53d00dd3699774fe420ed1bac0fa241bca7a1f05c3f7d2ef12e025d85e04a4ee \\\\\n && docker tag drone/drone:2.17.0@sha256:53d00dd3699774fe420ed1bac0fa241bca7a1f05c3f7d2ef12e025d85e04a4ee $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.17.0 \\\\\n && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.17.0 && break\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"initialise failed\"\n exit 1\n fi\n echo \"retrying..$n\"\n sleep 5\ndone\n" ], "environment": { "REGISTRY_DOMAIN": { @@ -64,7 +64,7 @@ } }, "image": "docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f", - "name": "drone/drone:2.4.0", + "name": "drone/drone:2.17.0", "volumes": [ { "name": "dockersock", @@ -155,7 +155,7 @@ }, { "image": "appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea", - "name": "drone/drone:2.4.0", + "name": "drone/drone:2.17.0", "settings": { "envs": [ "drone_tag", @@ -170,10 +170,10 @@ ], "script": [ "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n", - "docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0", - "docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 -o /stack/.images/drone/drone_drone:2.4.0.tar", - "echo \"docker load < drone_drone:2.4.0.tar\" >> /stack/.images/drone/load.sh", - "echo \"docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 $${DESTINATION_REGISTRY}/stack/drone/drone/drone:2.4.0\" >> /stack/.images/drone/load.sh" + "docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.17.0", + "docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.17.0 -o /stack/.images/drone/drone_drone:2.17.0.tar", + "echo \"docker load < drone_drone:2.17.0.tar\" >> /stack/.images/drone/load.sh", + "echo \"docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.17.0 $${DESTINATION_REGISTRY}/stack/drone/drone/drone:2.17.0\" >> /stack/.images/drone/load.sh" ] } }, diff --git a/docker-compose.yml b/docker-compose.yml index 93648aa..89de94f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${LOCAL_DOCKER_REGISTRY}drone/drone:2.4.0 + image: ${LOCAL_DOCKER_REGISTRY}drone/drone:2.17.0 volumes: - drone-5:/var/lib/drone - drone-data-5:/data