Don't output EXPOSE if empty port specified #490
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
PrashanthCorp
approved these changes
Sep 19, 2018
| defaultPort: string | ||
| } | ||
|
|
||
| export function getExposeStatements(port: string): string { |
There was a problem hiding this comment.
getExposeStatement? I don't see the reasoning behind the plural name.
There was a problem hiding this comment.
VS has scenarios where there are more than one (HTTPS and HTTP ports). I'm trying to keep similar to their logic.
ejizba
reviewed
Sep 20, 2018
| }; | ||
|
|
||
| function genDockerFile(serviceNameAndRelativePath: string, platform: string, os: string | undefined, port: string, { cmd, author, version, artifactName }: Partial<PackageInfo>): string { | ||
| let exposeStatements = getExposeStatements(port); |
There was a problem hiding this comment.
There seems to be an inconsistency where sometimes the genDockerFile has a 'port' parameter and sometimes it has an 'exposeStatements' parameter. Can we make that consistent?
StephenWeatherford
force-pushed
the
saw/no-port
branch
from
e35a8d2
to
39a35e4
Compare
ejizba
approved these changes
Sep 21, 2018
configureWorkspace/configure.ts
Outdated
| @@ -70,7 +77,14 @@ function genDockerFile(serviceNameAndRelativePath: string, platform: Platform, o | |||
| let generators = generatorsByPlatform.get(platform); | |||
| assert(generators, `Could not find dockerfile generator functions for "${platform}"`); | |||
| if (generators.genDockerFile) { | |||
| return generators.genDockerFile(serviceNameAndRelativePath, platform, os, port, { cmd, author, version, artifactName }); | |||
| let contents = generators.genDockerFile(serviceNameAndRelativePath, platform, os, exposeStatements, { cmd, author, version, artifactName }); | |||
There was a problem hiding this comment.
Looks like you missed changing this 'exposeStatements' back to 'port'
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #391
For next milestone.