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

Update image local build script #14599

Merged
merged 3 commits into from Jun 12, 2017

Conversation

stevekuznetsov
Copy link
Contributor

Use the full image name for local image build FROM

When we are writing the FROM statement for the local image build
Dockerfile, we need to use the fully qualified name of the image we
are building on top of.

Signed-off-by: Steve Kuznetsov skuznets@redhat.com


Ensure local image tmp dirs are cleaned up on error

When the script fails to build an image, we need to ensure that the temp
directory we created for context is cleaned up anyway. Trapping the
functionality on exit is the appropriate way to acheive this.

Signed-off-by: Steve Kuznetsov skuznets@redhat.com


Removed extraneous comma from local build debugging output

Signed-off-by: Steve Kuznetsov skuznets@redhat.com


/cc @bparees
@knobunc can you try this one out?

When we are writing the `FROM` statement for the local image build
Dockerfile, we need to use the fully qualified name of the image we
are building on top of.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
When the script fails to build an image, we need to ensure that the temp
directory we created for context is cleaned up anyway. Trapping the
functionality on exit is the appropriate way to acheive this.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov stevekuznetsov changed the title Skuznets/update image local Update image local build script Jun 12, 2017
@stevekuznetsov
Copy link
Contributor Author

@knobunc confirms it works for him, and for me locally -- @bparees all you

@@ -161,5 +165,3 @@ def debug(message):

remove(join(context_dir, "Dockerfile"))
rmtree(join(context_dir, "src", image))

rmtree(context_dir)
Copy link
Contributor

Choose a reason for hiding this comment

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

why don't we want this cleanup?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's atexit

@bparees bparees merged commit fcd56bc into openshift:master Jun 12, 2017
@bparees
Copy link
Contributor

bparees commented Jun 12, 2017

(more manually merging because it can't break anything and don't want to block others on the queue)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants