Wrap docker labels with " character #1014
Merged
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
|
Hi @kimxogus, Thank you for your contribution! We really value the time you've taken to put this together. Before we proceed with reviewing this pull request, please sign the Lightbend Contributors License Agreement: |
muuki88
requested changes
Aug 21, 2017
| val (variable, value) = label | ||
| Cmd("LABEL", s"${variable}=${value}") | ||
| val valueString = value match { | ||
| case n: Number => n.toString |
There was a problem hiding this comment.
Why the special case for numbers? I haven't found an example that highlights
a special behavior?
There was a problem hiding this comment.
Oh, I scanned Dockerfile docs again and it seems not to be needed. I'll change it to wrap everything in ".
| @@ -31,7 +31,7 @@ trait DockerKeys { | |||
| val dockerExecCommand = SettingKey[Seq[String]]("dockerExecCommand", "The shell command used to exec Docker") | |||
| val dockerBuildOptions = SettingKey[Seq[String]]("dockerBuildOptions", "Options used for the Docker build") | |||
| val dockerBuildCommand = SettingKey[Seq[String]]("dockerBuildCommand", "Command for building the Docker image") | |||
| val dockerLabels = SettingKey[Map[String, String]]("dockerLabels", "Labels applied to the Docker image") | |||
| val dockerLabels = SettingKey[Map[String, Any]]("dockerLabels", "Labels applied to the Docker image") | |||
There was a problem hiding this comment.
Any is not a good type here. If the number/string separation is really necessary I would rather map this into a separate ADT. We then need to introduce implicit conversions to not break existing builds.
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.
Issue
For now,
dockerLabelsdoesn't generate labels with wrapping"character.LABEL foo=barThis may have issue with string values with spaces
LABEL fooBar=foo barFix
Fixed that to wrap with
"character.Also,
dockerLabelswill accept map containing any type of value and make them string automatically(for convenience).Only
Numbertyped values won't be wrapped with"character