stack
/
squid
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

test: squid:4
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-06 11:10:50 +01:00
parent 12e3666db0
commit b3c9b54c0c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone/drone-home.jsonnet
View File

@ -112,9 +112,9 @@ local publicSecrets = import 'lib/public-secrets.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",
] ]
} }

3
.drone/drone-home.yml
View File

@ -54,9 +54,6 @@ steps:
- 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
- docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"
- 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

2
docker-compose.yml
View File

@ -7,7 +7,7 @@ services:
replicas: 1 replicas: 1
restart_policy: restart_policy:
condition: any condition: any
image: ${SQUID_IMAGE} image: wrouesnel/docker-squid4
volumes: volumes:
- squid-cache:/apps/squid/var/cache/squid - squid-cache:/apps/squid/var/cache/squid
#- ./squid.intercept.conf:/etc/squid/squid.conf #- ./squid.intercept.conf:/etc/squid/squid.conf