diff --git a/.drone/deploy.sh b/.drone/deploy.sh index 039c9d0..0e43a53 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -2,4 +2,4 @@ export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \ && docker stack rm guacamole \ && echo 'sleeping...zzz' \ && sleep 60 \ -&& docker stack deploy -c docker-compose.yml guacamole \ +&& docker stack deploy -c docker-compose.yml guacamole --with-registry-auth diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 81ca826..b83a259 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -30,7 +30,7 @@ steps: commands: - set -e - 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: - name: dockersock path: /var/run @@ -44,6 +44,8 @@ services: path: /var/run - name: ca path: /etc/docker/certs.d + - name: daemonjson + path: /etc/docker/daemon.json volumes: - name: dockersock @@ -51,6 +53,9 @@ volumes: - name: ca host: path: /etc/docker/certs.d +- name: daemonjson + host: + path: /etc/docker/daemon.json image_pull_secrets: - dockerconfigjson @@ -165,6 +170,8 @@ services: path: /var/run - name: ca path: /etc/docker/certs.d + - name: daemonjson + path: /etc/docker/daemon.json volumes: - name: dockersock @@ -172,6 +179,9 @@ volumes: - name: ca host: path: /etc/docker/certs.d +- name: daemonjson + host: + path: /etc/docker/daemon.json trigger: event: diff --git a/.drone/package.json b/.drone/package.json index 0f0cc55..aa629eb 100644 --- a/.drone/package.json +++ b/.drone/package.json @@ -4,6 +4,6 @@ "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" }, "dependencies": { - "@sigyl/jsonnet-drone": "^0.3.1" + "@sigyl/jsonnet-drone": "^0.4.1" } } diff --git a/.drone/yarn.lock b/.drone/yarn.lock index f9b7ae3..415f02c 100644 --- a/.drone/yarn.lock +++ b/.drone/yarn.lock @@ -12,10 +12,10 @@ resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== -"@sigyl/jsonnet-drone@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.3.1.tgz#790a83f45556cc613f07fbc98ca760027fa936e7" - integrity sha512-FiSyunjR0Udc20I2gA6gkzX3sCB2dPq/ZODrXcm7ROQFKF2Wr4b+xhpovjEdnjKGy8G4d+rRcdN+Jyhp7WQLEg== +"@sigyl/jsonnet-drone@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7" + integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A== dependencies: "@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-drone-environment" "0.0.5"