Skip to content
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.

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

Make fsfreeze image building consistent #835

Merged
merged 1 commit into from
Sep 12, 2018
Merged

Conversation

nrb
Copy link
Contributor

@nrb nrb commented Sep 10, 2018

Due to the version of docker used to build images, the Dockerfile used
with -f must be in the same directory that's used for the context. Copy
the Dockerfile into the _output directory and make the custom targets
more closely match the standard ones.

Fixes #833

Signed-off-by: Nolan Brubaker nolan@heptio.com

@nrb
Copy link
Contributor Author

nrb commented Sep 10, 2018

I have not yet tested this on Jenkins, however I've documented what I found in the commit. We may want to create a branch to build with, but then we'll end up with extra tags on GCR that will need to clean up.

Copy link
Contributor

@carlisia carlisia left a comment

Choose a reason for hiding this comment

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

lgtm 👍

@skriss
Copy link
Contributor

skriss commented Sep 10, 2018

I'm testing locally by running each of the following commands:

REGISTRY=myregistry VERSION=master make all-containers
REGISTRY=myregistry VERSION=master make all-push
REGISTRY=myregistry VERSION=master make build-fsfreeze
REGISTRY=myregistry VERSION=master make push-fsfreeze

@skriss
Copy link
Contributor

skriss commented Sep 10, 2018

I had to change https://github.com/heptio/ark/pull/835/files#diff-b67911656ef5d18c4ae36cb6741b7965R61 to IMAGE = $(REGISTRY)/$(BIN) (not :=) which I think allows it to be re-evaluated. otherwise the fsfreeze-pause image was getting tagged as .../ark:master

@skriss
Copy link
Contributor

skriss commented Sep 10, 2018

I'm fine merging this to master once it looks good locally. we can confirm it works there and fix if anything doesn't work.

@nrb
Copy link
Contributor Author

nrb commented Sep 11, 2018

otherwise the fsfreeze-pause image was getting tagged as .../ark:master

Interesting, I wasn't seeing that, but it may have been a caching setting. I'll make that change though.

EDIT: Ah, there it is - I deleted my image and it untagged ark:master as well as the fsfreeze-pause one.

@nrb
Copy link
Contributor Author

nrb commented Sep 11, 2018

Change made.

Makefile Outdated
@@ -21,7 +21,7 @@ BIN ?= ark
PKG := github.com/heptio/ark

# Where to push the docker image.
REGISTRY ?= gcr.io/heptio-images
Copy link
Contributor

Choose a reason for hiding this comment

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

undo :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Due to the version of docker used to build images, the Dockerfile used
with -f must be in the same directory that's used for the context. Copy
the Dockerfile into the _output directory and make the custom targets
more closely match the standard ones.

Fixes vmware-tanzu#833

Signed-off-by: Nolan Brubaker <nolan@heptio.com>
Copy link
Contributor

@skriss skriss left a comment

Choose a reason for hiding this comment

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

LGTM

@skriss skriss merged commit 3eb1160 into vmware-tanzu:master Sep 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

image builds of master are failing
3 participants