Use sls_build for building docker images#39467
Conversation
salt/modules/dockerng.py
Outdated
There was a problem hiding this comment.
This was removed because there is no reason to add a name to the container when we are just going to delete it at the end.
|
Go Go Jenkins! |
|
Ugh, the test suite hates me! I thought I got them all yesterday when it
failed >.< I will look at them when I get off the plane in Denver, thanks!
…On Fri, Feb 17, 2017 at 12:17 PM Mike Place ***@***.***> wrote:
@gtmanfred <https://github.com/gtmanfred> We have some test failures
here:
https://jenkins.saltstack.com/job/PR/job/salt-pr-rs-cent7-n/8839/testReport/junit/unit.modules.dockerng_test/DockerngTestCase/test_sls_build/
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#39467 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAssoTW1kJFrKpMiBAFvHeC5yrzOdWvcks5rdeQ-gaJpZM4MDqNP>
.
|
|
@gtmanfred Merge conflict now I'm afraid. |
gtmanfred
force-pushed
the
sls_build
branch
4 times, most recently
from
9adb935 to
14e166d
Compare
|
Ok, all the tests should pass on the last one, and I went through and just squashed all the changes down to one commit because i bungled the rebase. Thanks! |
|
Go Go Jenkins! |
gtmanfred
force-pushed
the
sls_build
branch
2 times, most recently
from
f8e8b1b to
5eed60b
Compare
|
Go Go Jenkins! |
salt/modules/docker.py
Outdated
There was a problem hiding this comment.
Could you clarify the reason that this needs to be removed?
There was a problem hiding this comment.
The name is only used for generating a container with a name, we never use that name, we always use the id_ when referencing it
However in the docker.image_present state, we add the tag ':latest' to any image that does not already have a tag in it's name variable, and : is not a valid character in the name of a container, though we still want the tag in the name of the image.
|
rebased again 😃 darn merge forwards! |
|
Go Go Jenkins! |
2 participants
What does this PR do?
Allows the use of
docker.sls_buildwith building images fordocker.image_present.Also fix some bad logic with clearing out the created docker containers after a build was finished. Without the reorganization around the dryrun check, we would leave behind the container that was used to create the image. The logic is fixed here. 5eed60b?diff=split#diff-8f4981346bb8d093255737c1cd281ef6R5986
Tests written?
No