From 86907f85616887d0975a3bb1fd7b3a02e2aa1383 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 22 Oct 2020 12:36:21 +0100 Subject: [PATCH] . --- .drone/drone-home.yml | 10 ++++++++++ .drone/scripts/initialise-images.sh | 4 ++-- docker-compose.yml | 12 ++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 4da366f..71cc8d3 100644 --- a/.drone/drone-home.yml +++ b/.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 @@ -267,6 +272,8 @@ services: path: /var/run - name: ca path: /etc/docker/certs.d + - name: daemonjson + path: /etc/docker/daemon.json volumes: - name: dockersock @@ -274,6 +281,9 @@ volumes: - name: ca host: path: /etc/docker/certs.d +- name: daemonjson + host: + path: /etc/docker/daemon.json trigger: event: diff --git a/.drone/scripts/initialise-images.sh b/.drone/scripts/initialise-images.sh index 5cb7acb..40d45dc 100644 --- a/.drone/scripts/initialise-images.sh +++ b/.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 \ No newline at end of file +&& 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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 48ba90e..ce18447 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ 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-2:/var/lib/drone - - drone-data-2:/data + - drone-3:/var/lib/drone + - drone-data-3:/data environment: - DRONE_LOGS_DEBUG=true - DRONE_LOGS_PRETTY=true @@ -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-2: - drone-data-2: + drone-3: + drone-data-3: networks: appnet: