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

fix: rename local_registry_password
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-13 12:05:28 +01:00
parent 2e09f39cdc
commit eb113d091d
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.drone/drone-home.jsonnet
View File

@ -71,7 +71,7 @@ local util = import 'lib/util.libsonnet';
name +: 'build docker:dind image:', name +: 'build docker:dind image:',
environment +: environment.environmentSecrets([ environment +: environment.environmentSecrets([
'LOCAL_DOCKER_REGISTRY', 'LOCAL_DOCKER_REGISTRY',
'LOCAL_REGISTRY_PASSWORD', 'REGISTRY_PASSWORD',
'CA_CRT' 'CA_CRT'
]), ]),
volumes: [ volumes: [
@ -82,37 +82,14 @@ local util = import 'lib/util.libsonnet';
], ],
commands: [ commands: [
'set -e', 'set -e',
'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"', 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
'cd docker-dind', 'cd docker-dind',
'echo "$${CA_CRT}" > CA_crt.crt', 'echo "$${CA_CRT}" > CA_crt.crt',
'docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind', 'docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind',
'docker push $${LOCAL_DOCKER_REGISTRY}docker:dind', 'docker push $${LOCAL_DOCKER_REGISTRY}docker:dind',
'docker logout $${LOCAL_DOCKER_REGISTRY}', 'docker logout $${LOCAL_DOCKER_REGISTRY}',
], ],
}, /*
images.docker {
name +: 'build docker image:',
environment +: environment.environmentSecrets([
'LOCAL_DOCKER_REGISTRY',
'LOCAL_REGISTRY_PASSWORD',
]),
volumes: [
{
name: 'dockersock',
path: '/var/run',
}, },
],
commands: [
'set -e',
'pwd',
'sleep 15',
'cd docker',
'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid',
'docker push $${LOCAL_DOCKER_REGISTRY}squid',
'docker logout $${LOCAL_DOCKER_REGISTRY}',
],
} */
compose([ compose([
environment.envSet('local-docker-registry'), environment.envSet('local-docker-registry'),
environment.envSet('registry-password'), environment.envSet('registry-password'),

6
.drone/drone-home.yml
View File

@ -74,7 +74,7 @@ steps:
image: docker:dind image: docker:dind
commands: commands:
- set -e - set -e
- docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}" - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"
- cd docker-dind - cd docker-dind
- echo "$${CA_CRT}" > CA_crt.crt - echo "$${CA_CRT}" > CA_crt.crt
- docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind
@ -85,8 +85,8 @@ steps:
from_secret: ca-crt from_secret: ca-crt
LOCAL_DOCKER_REGISTRY: LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry from_secret: local-docker-registry
LOCAL_REGISTRY_PASSWORD: REGISTRY_PASSWORD:
from_secret: local-registry-password from_secret: registry-password
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run