.
continuous-integration/drone/push Build is passing Details
continuous-integration/drone Build is running Details

This commit is contained in:
Giles Bradshaw 2020-10-22 12:36:21 +01:00
parent d440b94e0e
commit 86907f8561
3 changed files with 18 additions and 8 deletions

View File

@ -51,6 +51,8 @@ services:
path: /var/run path: /var/run
- name: ca - name: ca
path: /etc/docker/certs.d path: /etc/docker/certs.d
- name: daemonjson
path: /etc/docker/daemon.json
volumes: volumes:
- name: dockersock - name: dockersock
@ -58,6 +60,9 @@ volumes:
- name: ca - name: ca
host: host:
path: /etc/docker/certs.d path: /etc/docker/certs.d
- name: daemonjson
host:
path: /etc/docker/daemon.json
image_pull_secrets: image_pull_secrets:
- dockerconfigjson - dockerconfigjson
@ -267,6 +272,8 @@ services:
path: /var/run path: /var/run
- name: ca - name: ca
path: /etc/docker/certs.d path: /etc/docker/certs.d
- name: daemonjson
path: /etc/docker/daemon.json
volumes: volumes:
- name: dockersock - name: dockersock
@ -274,6 +281,9 @@ volumes:
- name: ca - name: ca
host: host:
path: /etc/docker/certs.d path: /etc/docker/certs.d
- name: daemonjson
host:
path: /etc/docker/daemon.json
trigger: trigger:
event: event:

View File

@ -1,3 +1,3 @@
sh $(dirname $0)/login.sh $1 "$2" \ 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:1.9.1 \
&& sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.0 && sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.3

View File

@ -8,10 +8,10 @@ services:
replicas: 1 replicas: 1
restart_policy: restart_policy:
condition: any condition: any
image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.0 image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.1
volumes: volumes:
- drone-2:/var/lib/drone - drone-3:/var/lib/drone
- drone-data-2:/data - drone-data-3:/data
environment: environment:
- DRONE_LOGS_DEBUG=true - DRONE_LOGS_DEBUG=true
- DRONE_LOGS_PRETTY=true - DRONE_LOGS_PRETTY=true
@ -37,7 +37,7 @@ services:
replicas: 1 replicas: 1
restart_policy: restart_policy:
condition: any 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: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
@ -50,8 +50,8 @@ services:
networks: networks:
- appnet - appnet
volumes: volumes:
drone-2: drone-3:
drone-data-2: drone-data-3:
networks: networks:
appnet: appnet: