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

This commit is contained in:
Giles Bradshaw 2020-08-06 16:06:53 +01:00
parent d4e943eabb
commit 88daf62b89
2 changed files with 10 additions and 2 deletions

View File

@ -136,14 +136,17 @@ local util = import 'lib/util.libsonnet';
//"docker stack rm squid", //"docker stack rm squid",
//"sleep 60", //"sleep 60",
// "docker volume rm squid_squid-cache", // "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 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", "docker stack deploy -c docker-compose.yml squid",
] ]
} }
}, },
), ),
], ],
image_pull_secrets: [
'dockerconfigjson'
]
} }
] ]

View File

@ -97,6 +97,8 @@ steps:
- set -e - set -e
- cd /stack/squid/myCA - cd /stack/squid/myCA
- cd .. - cd ..
- export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid
- docker pull $${SQUID_IMAGE}
- docker stack deploy -c docker-compose.yml squid - docker stack deploy -c docker-compose.yml squid
username: username:
from_secret: ssh-user from_secret: ssh-user
@ -127,4 +129,7 @@ volumes:
host: host:
path: /etc/docker/certs.d path: /etc/docker/certs.d
image_pull_secrets:
- dockerconfigjson
... ...