Skip to content

build_deploy: fix docker build CLI syntax #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 13, 2020
Merged

build_deploy: fix docker build CLI syntax #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/build_deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ensure_build_container "${DOCKERFILE_BUILD}"

DOCKERFILE_DEPLOY="$ABSOLUTE_PATH/Dockerfile.deploy/Dockerfile"

docker build -t "${IMAGE}:${IMAGE_TAG}" $DOCKERFILE_DEPLOY
docker build -t "${IMAGE}:${IMAGE_TAG}" -f $DOCKERFILE_DEPLOY .
Copy link
Copy Markdown
Member

@wking wking Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we dropped -f in 071c112 (#24). What changed to make it required again?

Copy link
Copy Markdown
Member

@wking wking Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, de5b199 (#222) shifted this from a $RELEASE_OUTPUT_DIR directory to a $DOCKERFILE_DEPLOY Dockerfile.

/lgtm

Copy link
Copy Markdown
Contributor Author

@vrutkovs vrutkovs Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In #24 the script was reworked to create a temp dir and copying binaries produced by cargo build --release there. In multistage build its no longer required, so the context is set to the whole dir and it requires the path to dockerfile


if [[ -n "$QUAY_USER" && -n "$QUAY_TOKEN" ]]; then
DOCKER_CONF="$PWD/.docker"
Expand Down