We should only warn if user actually requests Hostname be set in image #1253
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
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
|
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1661592 in buildah |
|
@adelton PTAL |
|
LGTM |
vrothberg
reviewed
Jan 2, 2019
cmd/buildah/config.go
Outdated
| @@ -244,7 +244,11 @@ func updateConfig(builder *buildah.Builder, c *cli.Context) { | |||
| builder.SetDomainname(c.String("domainname")) | |||
| } | |||
| if c.IsSet("hostname") { | |||
| builder.SetHostname(c.String("hostname")) | |||
| name := c.String("hostname") | |||
| if name != "" && builder.Format != buildah.Dockerv2ImageManifest { | |||
There was a problem hiding this comment.
Can we instead use ... != buildah.OCIv1ImageManifest? Currently, it works as there are only two formats but who knows what the future holds?
There was a problem hiding this comment.
So you want to only report the warning, if buildah.Format == buildah.OCIv1ImageManifest, since we know that OCIv1ImageManifest does not support it but OCIV2ImageManifest, might so we would not need to change the code.
When we set the Hostname to match the container id, we don't want to print the warning, since the user did not request the hostname being set. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
|
LGTM |
|
📌 Commit fcc624c has been approved by |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Jan 3, 2019
When we set the Hostname to match the container id, we don't want to print the warning, since the user did not request the hostname being set. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1253 Approved by: vrothberg
|
💔 Test failed - status-travis |
|
☀️ Test successful - status-papr, status-travis |
TomSweeneyRedHat
pushed a commit
to TomSweeneyRedHat/buildah
that referenced
this pull request
Jan 4, 2019
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: containers#1253 Approved by: vrothberg
TomSweeneyRedHat
pushed a commit
to TomSweeneyRedHat/buildah
that referenced
this pull request
Jan 4, 2019
When we set the Hostname to match the container id, we don't want to print the warning, since the user did not request the hostname being set. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: containers#1253 Approved by: vrothberg
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.
When we set the Hostname to match the container id, we don't want to print
the warning, since the user did not request the hostname being set.
Signed-off-by: Daniel J Walsh dwalsh@redhat.com