diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 75c1e32..0547c16 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -68,10 +68,11 @@ local util = import 'lib/util.libsonnet'; ), images.wait(15), images.docker { - name +: 'build docker image:', + name +: 'build docker:dind image:', environment +: environment.environmentSecrets([ 'LOCAL_DOCKER_REGISTRY', 'LOCAL_REGISTRY_PASSWORD', + 'CA_CRT' ]), volumes: [ { @@ -81,15 +82,13 @@ local util = import 'lib/util.libsonnet'; ], commands: [ 'set -e', - 'pwd', - 'sleep 15', - '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}', + 'sleep 15', + 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"', + 'cd docker-dind', + 'cat "$${CA_CRT}" > CA_crt.crt', + 'docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind', + 'docker push $${LOCAL_DOCKER_REGISTRY}docker:dind', + 'docker logout $${LOCAL_DOCKER_REGISTRY}', ], }, /* images.docker { diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index c52fc8e..f8f295e 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -70,15 +70,20 @@ steps: commands: - sleep 15 -- name: "dockerbuild docker image:" +- name: "dockerbuild docker:dind image:" image: docker:dind commands: - set -e - - pwd - sleep 15 - - export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid - - docker pull $${SQUID_IMAGE} + - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}" + - cd docker-dind + - cat "$${CA_CRT}" > CA_crt.crt + - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind + - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind + - docker logout $${LOCAL_DOCKER_REGISTRY} environment: + CA_CRT: + from_secret: ca-crt LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry LOCAL_REGISTRY_PASSWORD: diff --git a/docker-dind/Dockerfile b/docker-dind/Dockerfile new file mode 100644 index 0000000..6fa9af8 --- /dev/null +++ b/docker-dind/Dockerfile @@ -0,0 +1,3 @@ +FROM docker:18.06.0-dind +COPY CA_crt.crt /usr/local/share/ca-certificates/CA_crt.crt +RUN update-ca-certificates