Commit ef2ceff2 authored by Adrian Sutton's avatar Adrian Sutton

ci: Allow . and / in docker tags.

Remove the publish step because all tags are added by the docker buildx step already.
parent 8ec6427a
......@@ -218,7 +218,7 @@ jobs:
export REGISTRY="<<parameters.registry>>"
export REPOSITORY="<<parameters.repo>>"
export IMAGE_TAGS="$(echo -ne "<<parameters.docker_tags>>" | sed "s/[^a-zA-Z0-9\n,]/-/g")"
export IMAGE_TAGS="$(echo -ne "<<parameters.docker_tags>>" | sed "s/[^a-zA-Z0-9\n,./]/-/g")"
export GIT_COMMIT="$(git rev-parse HEAD)"
export GIT_DATE="$(git show -s --format='%ct')"
export GIT_VERSION="<<pipeline.git.tag>>"
......@@ -272,20 +272,6 @@ jobs:
root: /tmp/docker_images
paths: # only write the one file, to avoid concurrent workspace-file additions
- "<<parameters.docker_name>>.tar"
- when:
condition: "<<parameters.publish>>"
steps:
- run:
name: Publish
command: |
gcloud auth configure-docker <<parameters.registry>>
IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>"
# tags, without the '-t ' here, so we can loop over them
DOCKER_TAGS="$(echo -ne "<<parameters.docker_tags>>" | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|${IMAGE_BASE}:|")"
for docker_image_tag in $DOCKER_TAGS; do
docker image push $docker_image_tag
done
no_output_timeout: 45m
- when:
condition: "<<parameters.release>>"
steps:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment