.
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-05-11 15:08:31 +01:00
parent 55781975d0
commit bc6c0eec67
5 changed files with 9 additions and 6 deletions

View File

@ -23,7 +23,7 @@ def buildDockerFolder(
]), ]),
"commands": [ "commands": [
"cd {folder}".format(folder=folder), "cd {folder}".format(folder=folder),
"docker login $${LOCAL_DOCKER_REGISTRY} --username client --password '$${REGISTRY_PASSWORD}'", 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
"sh build-docker-folder.sh {dockerFile} {image} {tag}".format( "sh build-docker-folder.sh {dockerFile} {image} {tag}".format(
image = image, image = image,
dockerFile = dockerFile, dockerFile = dockerFile,

View File

@ -18,7 +18,7 @@ def buildFolder(name, folder):
]), ]),
"commands": [ "commands": [
"cd {folder}".format(folder=folder), "cd {folder}".format(folder=folder),
"docker login $${LOCAL_DOCKER_REGISTRY} --username client --password '$${REGISTRY_PASSWORD}'", 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
"sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name), "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name),
], ],
} }

View File

@ -16,7 +16,7 @@ def build(name):
]), ]),
"commands": [ "commands": [
"cd {name}".format(name=name), "cd {name}".format(name=name),
"docker login $${LOCAL_DOCKER_REGISTRY} --username client --password '$${REGISTRY_PASSWORD}'", 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
"docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name),
"docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name),
], ],

View File

@ -30,7 +30,7 @@ def deploy(
"export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
"docker network prune -f", "docker network prune -f",
"cd {folder}".format(folder=folder), "cd {folder}".format(folder=folder),
"docker login $${LOCAL_DOCKER_REGISTRY} --username client --password '$${REGISTRY_PASSWORD}'", 'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
"docker stack rm {name}".format(name = name), "docker stack rm {name}".format(name = name),
"sleep 30", "sleep 30",
"docker stack deploy -c {filename} {name}".format(name= name, filename = filename), "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),

View File

@ -7,7 +7,10 @@ def pull(
name, name,
images, images,
): ):
secrets = [ "local-docker-registry"] secrets = [
"local-docker-registry",
"registry-password",
]
return { return {
"name": name, "name": name,
"image": "appleboy/drone-ssh", "image": "appleboy/drone-ssh",
@ -22,7 +25,7 @@ def pull(
"set -e" "set -e"
] + ] +
map(export, secrets) + map(export, secrets) +
["docker login $${LOCAL_DOCKER_REGISTRY} --username client --password '$${REGISTRY_PASSWORD}'"] + ['docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"'] +
["docker pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] ["docker pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ]
} }
} }