Allow docker command to be null, set default CMD in dockerfile instead #1615
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fabianvf
force-pushed
the
molecule-docker-cmd
branch
from
07bee14 to
6351a34
Compare
webknjaz
approved these changes
Dec 6, 2018
|
Need to update the tests that are relying on the docket default command directive, will try to get that pushed this morning. |
gundalow
changed the title
fabianvf
force-pushed
the
molecule-docker-cmd
branch
from
6351a34 to
7f4a0b1
Compare
|
I can't reproduce these failures locally, and it looks like master is failing with the same issue. It looks like it's not finding the molecule binary or something. |
fabianvf
force-pushed
the
molecule-docker-cmd
branch
from
7f4a0b1 to
de8eba3
Compare
fabianvf
changed the title
…le instead Signed-off-by: Fabian von Feilitzsch <[email protected]>
fabianvf
force-pushed
the
molecule-docker-cmd
branch
from
de8eba3 to
75f9064
Compare
Signed-off-by: Fabian von Feilitzsch <[email protected]>
fabianvf
force-pushed
the
molecule-docker-cmd
branch
from
039019a to
d97d43d
Compare
|
@fabianvf you can restart tests by just reopening PR if needed. Those previous failure was related to #1611 (combo of tox-dev/tox#1097 + psf/requests#4890), which is fixed now. |
|
@webknjaz I think I actually found the issue, there was a separate Dockerfile template for tests that didn't have the CMD directive in it. Think this should work now. |
|
Let's wait for results now. I've canceled the previous build because it was blocking the queue in CI. |
This comment has been minimized.
This comment has been minimized.
decentral1se
added a commit
to decentral1se/molecule
that referenced
this pull request
Feb 22, 2019
Closes ansible#1763. This adds a `override_command` key to the platforms definition. It defaults to true. A user who wants to override the `CMD` directive from their `Dockerfile.j2` can specify `override_command: False` to have it honoured. This allows 3 use cases to be covered: * Getting the zero configuration default of `bash -c ...` * Overriding the `CMD` directive from the `command` key * Overriding the `CMD` directive from the `Dockerfile.j2` and setting `override_command: false` See also: * ansible#1615 * ansible#1614 * ansible#1441 Signed-off-by: Luke Murphy <[email protected]>
decentral1se
added a commit
to decentral1se/molecule
that referenced
this pull request
Feb 24, 2019
Closes ansible#1763. This adds a `override_command` key to the platforms definition. It defaults to true. A user who wants to override the `CMD` directive from their `Dockerfile.j2` can specify `override_command: False` to have it honoured. This allows 3 use cases to be covered: * Getting the zero configuration default of `bash -c ...` * Overriding the `CMD` directive from the `command` key * Overriding the `CMD` directive from the `Dockerfile.j2` and setting `override_command: false` See also: * ansible#1615 * ansible#1614 * ansible#1441 Signed-off-by: Luke Murphy <[email protected]>
decentral1se
added a commit
that referenced
this pull request
Feb 25, 2019
Closes #1763. This adds a `override_command` key to the platforms definition. It defaults to true. A user who wants to override the `CMD` directive from their `Dockerfile.j2` can specify `override_command: False` to have it honoured. This allows 3 use cases to be covered: * Getting the zero configuration default of `bash -c ...` * Overriding the `CMD` directive from the `command` key * Overriding the `CMD` directive from the `Dockerfile.j2` and setting `override_command: false` See also: * #1615 * #1614 * #1441 Signed-off-by: Luke Murphy <[email protected]>
ssbarnea
pushed a commit
to ssbarnea/molecule
that referenced
this pull request
Feb 27, 2019
Closes ansible#1763. This adds a `override_command` key to the platforms definition. It defaults to true. A user who wants to override the `CMD` directive from their `Dockerfile.j2` can specify `override_command: False` to have it honoured. This allows 3 use cases to be covered: * Getting the zero configuration default of `bash -c ...` * Overriding the `CMD` directive from the `command` key * Overriding the `CMD` directive from the `Dockerfile.j2` and setting `override_command: false` See also: * ansible#1615 * ansible#1614 * ansible#1441 Signed-off-by: Luke Murphy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1614
PR Type
Instead of setting the default command value of
while true; do sleep 10000; donein thedocker_containerinvocation, create the sample Dockerfile with the default CMD on it, and allowcommandto be nullable, in which case it will use the existingCMDdirective on the image.