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

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

This commit is contained in:
Giles Bradshaw 2020-08-06 16:33:26 +01:00
parent 88daf62b89
commit 822a9c0550
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.drone/drone-home.jsonnet
View File

@ -67,7 +67,7 @@ local util = import 'lib/util.libsonnet';
'/stack/squid'
),
images.wait(15),
/*images.docker {
images.docker {
name +: 'build docker image:',
environment +: environment.environmentSecrets([
'LOCAL_DOCKER_REGISTRY',
@ -83,13 +83,15 @@ local util = import 'lib/util.libsonnet';
'set -e',
'pwd',
'sleep 15',
'cd squid-4',
'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid-4',
'docker push $${LOCAL_DOCKER_REGISTRY}squid-4',
'docker logout $${LOCAL_DOCKER_REGISTRY}',
'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid',
'docker pull $${SQUID_IMAGE}',
//'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
//'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid-4',
//'docker push $${LOCAL_DOCKER_REGISTRY}squid-4',
//'docker logout $${LOCAL_DOCKER_REGISTRY}',
],
},
}, /*
images.docker {
name +: 'build docker image:',
environment +: environment.environmentSecrets([
@ -137,7 +139,7 @@ local util = import 'lib/util.libsonnet';
//"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 login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
'docker pull $${SQUID_IMAGE}',
"docker stack deploy -c docker-compose.yml squid",
]

18
.drone/drone-home.yml
View File

@ -70,6 +70,23 @@ steps:
commands:
- sleep 15
- name: "dockerbuild docker image:"
image: docker:dind
commands:
- set -e
- pwd
- sleep 15
- export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid
- docker pull $${SQUID_IMAGE}
environment:
LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry
LOCAL_REGISTRY_PASSWORD:
from_secret: local-registry-password
volumes:
- name: dockersock
path: /var/run
- name: deploy squid
image: appleboy/drone-ssh
settings:
@ -98,6 +115,7 @@ steps:
- cd /stack/squid/myCA
- cd ..
- 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: