.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
0c24bb2b78
commit
1acb2e202d
|
@ -12,11 +12,11 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
|
||||||
disable: false,
|
disable: false,
|
||||||
depth: 0,
|
depth: 0,
|
||||||
},
|
},
|
||||||
trigger: {
|
/*trigger: {
|
||||||
event: [
|
event: [
|
||||||
'tag',
|
'tag',
|
||||||
],
|
],
|
||||||
},
|
},*/
|
||||||
services: [
|
services: [
|
||||||
images.docker {
|
images.docker {
|
||||||
privileged: true,
|
privileged: true,
|
||||||
|
@ -49,7 +49,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
|
||||||
'/stack/squid'
|
'/stack/squid'
|
||||||
),
|
),
|
||||||
images.wait(15),
|
images.wait(15),
|
||||||
images.docker {
|
/*images.docker {
|
||||||
name +: 'build docker image:',
|
name +: 'build docker image:',
|
||||||
environment +: environment.environmentSecrets([
|
environment +: environment.environmentSecrets([
|
||||||
'LOCAL_DOCKER_REGISTRY',
|
'LOCAL_DOCKER_REGISTRY',
|
||||||
|
@ -71,7 +71,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
|
||||||
'docker push $${LOCAL_DOCKER_REGISTRY}squid',
|
'docker push $${LOCAL_DOCKER_REGISTRY}squid',
|
||||||
'docker logout $${LOCAL_DOCKER_REGISTRY}',
|
'docker logout $${LOCAL_DOCKER_REGISTRY}',
|
||||||
],
|
],
|
||||||
},
|
},*/
|
||||||
compose([
|
compose([
|
||||||
environment.envSet('local-docker-registry'),
|
environment.envSet('local-docker-registry'),
|
||||||
environment.envSet('local-registry-password'),
|
environment.envSet('local-registry-password'),
|
||||||
|
|
|
@ -29,26 +29,6 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- sleep 15
|
- sleep 15
|
||||||
|
|
||||||
- name: "dockerbuild docker image:"
|
|
||||||
image: docker:dind
|
|
||||||
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}
|
|
||||||
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
|
- name: deploy squid
|
||||||
image: appleboy/drone-ssh
|
image: appleboy/drone-ssh
|
||||||
settings:
|
settings:
|
||||||
|
@ -105,8 +85,4 @@ volumes:
|
||||||
host:
|
host:
|
||||||
path: /etc/docker/certs.d
|
path: /etc/docker/certs.d
|
||||||
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
Loading…
Reference in New Issue