test: squid:4
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
12e3666db0
commit
b3c9b54c0c
|
@ -112,9 +112,9 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
|
|||
"docker stack rm squid",
|
||||
"sleep 60",
|
||||
"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}',
|
||||
//'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",
|
||||
]
|
||||
}
|
||||
|
|
|
@ -54,9 +54,6 @@ steps:
|
|||
- docker stack rm squid
|
||||
- sleep 60
|
||||
- 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
|
||||
username:
|
||||
from_secret: ssh-user
|
||||
|
|
|
@ -7,7 +7,7 @@ services:
|
|||
replicas: 1
|
||||
restart_policy:
|
||||
condition: any
|
||||
image: ${SQUID_IMAGE}
|
||||
image: wrouesnel/docker-squid4
|
||||
volumes:
|
||||
- squid-cache:/apps/squid/var/cache/squid
|
||||
#- ./squid.intercept.conf:/etc/squid/squid.conf
|
||||
|
|
Loading…
Reference in New Issue