From 88daf62b89e6bcd2058105a73aa49760952506d1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 6 Aug 2020 16:06:53 +0100 Subject: [PATCH] . --- .drone/drone-home.jsonnet | 7 +++++-- .drone/drone-home.yml | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 7e24578..18e244a 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -136,14 +136,17 @@ local util = import 'lib/util.libsonnet'; //"docker stack rm squid", //"sleep 60", // "docker volume rm squid_squid-cache", - //'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid', + 'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid', //'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"', - //'docker pull $${SQUID_IMAGE}', + 'docker pull $${SQUID_IMAGE}', "docker stack deploy -c docker-compose.yml squid", ] } }, ), ], + image_pull_secrets: [ + 'dockerconfigjson' + ] } ] diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 0517d87..58b4882 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -97,6 +97,8 @@ steps: - set -e - cd /stack/squid/myCA - cd .. + - export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid + - docker pull $${SQUID_IMAGE} - docker stack deploy -c docker-compose.yml squid username: from_secret: ssh-user @@ -127,4 +129,7 @@ volumes: host: path: /etc/docker/certs.d +image_pull_secrets: +- dockerconfigjson + ...