Commit 324db7e3 authored by Joshua Gutow's avatar Joshua Gutow

CI: Remove optional target from docker-publish step

The old nightlies used a partial build (which is the purpose of
the --target flag), but they were removed in PR #3330 (commit
f772f66c).
parent ee7abf3b
...@@ -100,10 +100,6 @@ jobs: ...@@ -100,10 +100,6 @@ jobs:
docker_context: docker_context:
description: Docker build context description: Docker build context
type: string type: string
target:
description: Docker build target
type: string
default: ""
registry: registry:
description: Docker registry description: Docker registry
type: string type: string
...@@ -125,33 +121,16 @@ jobs: ...@@ -125,33 +121,16 @@ jobs:
- run: cat /etc/netplan/50-cloud-init.yaml - run: cat /etc/netplan/50-cloud-init.yaml
- run: sudo netplan apply - run: sudo netplan apply
- checkout - checkout
- when: - run:
condition: <<parameters.target>> name: Build
steps: command: |
- run: echo "$DOCKER_HUB_READ_ONLY_TOKEN" | docker login -u "$DOCKER_HUB_READ_ONLY_USER" --password-stdin
name: Build with context IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>"
command: | DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|-t ${IMAGE_BASE}:|")
echo "$DOCKER_HUB_READ_ONLY_TOKEN" | docker login -u "$DOCKER_HUB_READ_ONLY_USER" --password-stdin docker build \
IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>" $(echo -ne $DOCKER_TAGS | tr '\n' ' ') \
DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|-t ${IMAGE_BASE}:|") -f <<parameters.docker_file>> \
docker build \ <<parameters.docker_context>>
$(echo -ne $DOCKER_TAGS | tr '\n' ' ') \
-f <<parameters.docker_file>> \
--target <<parameters.target>> \
<<parameters.docker_context>>
- unless:
condition: <<parameters.target>>
steps:
- run:
name: Build
command: |
echo "$DOCKER_HUB_READ_ONLY_TOKEN" | docker login -u "$DOCKER_HUB_READ_ONLY_USER" --password-stdin
IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>"
DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|-t ${IMAGE_BASE}:|")
docker build \
$(echo -ne $DOCKER_TAGS | tr '\n' ' ') \
-f <<parameters.docker_file>> \
<<parameters.docker_context>>
- run: - run:
name: Publish name: Publish
command: | command: |
......
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