.

.drone/deploy.sh

@@ -2,4 +2,4 @@ export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/
 docker stack rm drone \
 && echo 'sleeping...zzz' \
 && sleep 60 \
-&& docker stack deploy -c docker-compose.yml drone
+&& docker stack deploy -c docker-compose.yml drone  --with-registry-auth

.drone/drone-home.yml

@@ -51,6 +51,8 @@ services:
     path: /var/run
   - name: ca
     path: /etc/docker/certs.d
+  - name: daemonjson
+    path: /etc/docker/daemon.json
 
 volumes:
 - name: dockersock
@@ -58,6 +60,9 @@ volumes:
 - name: ca
   host:
     path: /etc/docker/certs.d
+- name: daemonjson
+  host:
+    path: /etc/docker/daemon.json
 
 image_pull_secrets:
 - dockerconfigjson
@@ -91,6 +96,7 @@ steps:
     - registry_port
     - registry_password
     - scheme
+    - scheme
     - domain
     - drone_gitea_client_id
     - drone_gitea_server
@@ -107,6 +113,7 @@ steps:
     - "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\""
     - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\""
     - "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\""
+    - "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\""
     - "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\""
     - "echo \"export DRONE_GITEA_CLIENT_ID='$${DRONE_GITEA_CLIENT_ID}'\" >> env-drone # \"drone-gitea-client-id\""
     - "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\""
@@ -190,6 +197,7 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
+    - scheme
     - domain
     - drone_gitea_client_id
     - drone_gitea_server
@@ -208,6 +216,7 @@ steps:
     - export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET}
     - export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET}
     - export SSH_KEY=$${SSH_KEY}
+    - export SCHEME=$${SCHEME}
     - export DOMAIN=$${DOMAIN}
     - export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID}
     - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER}
@@ -263,6 +272,8 @@ services:
     path: /var/run
   - name: ca
     path: /etc/docker/certs.d
+  - name: daemonjson
+    path: /etc/docker/daemon.json
 
 volumes:
 - name: dockersock
@@ -270,6 +281,9 @@ volumes:
 - name: ca
   host:
     path: /etc/docker/certs.d
+- name: daemonjson
+  host:
+    path: /etc/docker/daemon.json
 
 trigger:
   event:

.drone/lib/public-secrets.libsonnet

@@ -1,4 +1,5 @@
 [
+  'scheme',
   'domain',
   'drone-gitea-client-id',
   'drone-gitea-server',

.drone/scripts/initialise-images.sh

@@ -1,3 +1,3 @@
 sh $(dirname $0)/login.sh $1 "$2" \
-&& sh $(dirname $0)/initialise-image.sh $1 drone/drone:1.9.0 \
-&& sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.0
+&& sh $(dirname $0)/initialise-image.sh $1 drone/drone:1.9.1 \
+&& sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.3

docker-compose.yml

@@ -8,14 +8,14 @@ services:
       replicas: 1
       restart_policy:
         condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.0
+    image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.1
     volumes:
-      - drone:/var/lib/drone
-      - drone-data:/data
+      - drone-5:/var/lib/drone
+      - drone-data-5:/data
     environment:
       - DRONE_LOGS_DEBUG=true
       - DRONE_LOGS_PRETTY=true
-      - DRONE_GITEA_SERVER=${SCHEME}://${DRONE_GITEA_SERVER}
+      - DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER}
       - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID}
       - DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET}
       - DRONE_SERVER_HOST=${DRONE_SERVER_HOST} # tunnel hostname       
@@ -37,7 +37,7 @@ services:
       replicas: 1
       restart_policy:
         condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}drone/drone-runner-docker:1.5.0
+    image: ${LOCAL_DOCKER_REGISTRY}drone/drone-runner-docker:1.5.3
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
@@ -50,8 +50,8 @@ services:
     networks:
       - appnet
 volumes:
-  drone:
-  drone-data:
+  drone-5:
+  drone-data-5:
 
 networks:
   appnet: