This commit is contained in:
Giles Bradshaw 2020-10-22 18:53:37 +01:00
parent 945a99c884
commit 3a9452f6a0
4 changed files with 17 additions and 7 deletions

View File

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

View File

@ -30,7 +30,7 @@ steps:
commands: commands:
- set -e - set -e
- export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ - export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/
- sh .drone/scripts/initialise-images.sh $${REGISTRY} $${REGISTRY_PASSWORD} - sh .drone/scripts/initialise-images.sh $${REGISTRY} "$${REGISTRY_PASSWORD}"
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
@ -44,6 +44,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
@ -51,6 +53,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
@ -165,6 +170,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
@ -172,6 +179,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

@ -4,6 +4,6 @@
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
}, },
"dependencies": { "dependencies": {
"@sigyl/jsonnet-drone": "^0.3.1" "@sigyl/jsonnet-drone": "^0.4.1"
} }
} }

View File

@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
"@sigyl/jsonnet-drone@^0.3.1": "@sigyl/jsonnet-drone@^0.4.1":
version "0.3.1" version "0.4.1"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.3.1.tgz#790a83f45556cc613f07fbc98ca760027fa936e7" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7"
integrity sha512-FiSyunjR0Udc20I2gA6gkzX3sCB2dPq/ZODrXcm7ROQFKF2Wr4b+xhpovjEdnjKGy8G4d+rRcdN+Jyhp7WQLEg== integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A==
dependencies: dependencies:
"@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-compose" "^0.0.2"
"@sigyl/jsonnet-drone-environment" "0.0.5" "@sigyl/jsonnet-drone-environment" "0.0.5"