-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Conversation
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm 👍
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 |
I had to change https://github.com/heptio/ark/pull/835/files#diff-b67911656ef5d18c4ae36cb6741b7965R61 to |
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. |
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 |
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
undo :)
There was a problem hiding this comment.
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>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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