diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 288bdbb..f33288e 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -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", ] } diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 06ee2c2..f151b15 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index ffeb08d..48c87cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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