From 4f1fb0f15e2e8dc054e9c41a5cae77689ba20eb4 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 11 May 2020 14:57:52 +0100 Subject: [PATCH] . --- drone-starlark/repos/build-docker-folder.star | 2 +- drone-starlark/repos/build-folder.star | 2 +- drone-starlark/repos/build.star | 2 +- drone-starlark/repos/deploy.star | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drone-starlark/repos/build-docker-folder.star b/drone-starlark/repos/build-docker-folder.star index d616590..61b1f76 100644 --- a/drone-starlark/repos/build-docker-folder.star +++ b/drone-starlark/repos/build-docker-folder.star @@ -23,7 +23,7 @@ def buildDockerFolder( ]), "commands": [ "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( image = image, dockerFile = dockerFile, diff --git a/drone-starlark/repos/build-folder.star b/drone-starlark/repos/build-folder.star index ca42e34..87876d1 100644 --- a/drone-starlark/repos/build-folder.star +++ b/drone-starlark/repos/build-folder.star @@ -18,7 +18,7 @@ def buildFolder(name, folder): ]), "commands": [ "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), ], } diff --git a/drone-starlark/repos/build.star b/drone-starlark/repos/build.star index dd4c7f5..2836037 100644 --- a/drone-starlark/repos/build.star +++ b/drone-starlark/repos/build.star @@ -16,7 +16,7 @@ def build(name): ]), "commands": [ "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 push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), ], diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star index 9575e3e..be6a52e 100644 --- a/drone-starlark/repos/deploy.star +++ b/drone-starlark/repos/deploy.star @@ -30,7 +30,7 @@ def deploy( "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "docker network prune -f", "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), "sleep 30", "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),