-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
adding EXPOSE command #41
Merged
sharifelgamal
merged 4 commits into
GoogleContainerTools:master
from
sharifelgamal:expose-cmd
Mar 20, 2018
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package commands | ||
|
||
import ( | ||
"github.com/containers/image/manifest" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"strings" | ||
) | ||
|
||
type ExposeCommand struct { | ||
cmd *instructions.ExposeCommand | ||
} | ||
|
||
func (r *ExposeCommand) ExecuteCommand(config *manifest.Schema2Config) error { | ||
return updateExposedPorts(r.Ports, config) | ||
} | ||
|
||
func updateExposedPorts(ports []string, config *manifest.Schema2Config) error { | ||
// Grab the currently exposed ports | ||
existingPorts := config.ExposedPorts | ||
|
||
// Add any new ones in | ||
for _, p := range ports { | ||
// Add the default protocol if one isn't specified | ||
if !strings.Contains(p, "/") { | ||
p = p + "/tcp" | ||
} | ||
existingPorts[p] = {} | ||
} | ||
config.ExposedPorts = existingPorts | ||
return nil | ||
} | ||
|
||
func (r *ExposeCommand) FilesToSnapshot() []string { | ||
return []string{} | ||
} | ||
|
||
func (r *ExposeCommand) CreatedBy() string { | ||
s := []string{"/bin/sh", "-c"} | ||
return strings.Join(append(s, r.Ports...), " ") | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package commands | ||
|
||
import ( | ||
"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||
"github.com/containers/image/manifest" | ||
"testing" | ||
) | ||
|
||
func TestUpdateExposedPorts(t *testing.T) { | ||
cfg := &manifest.Schema2Config{ | ||
ExposedPorts: manifest.Schema2PortSet{ | ||
"8080/tcp": {}, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you add a few test cases with udp in here as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
}, | ||
} | ||
|
||
ports := []string{ | ||
"8080", | ||
"8081/tcp", | ||
"8082", | ||
} | ||
|
||
expectedPorts := manifest.Schema2PortSet{ | ||
"8080/tcp": {}, | ||
"8081/tcp": {}, | ||
"8082/tcp": {}, | ||
} | ||
|
||
updateExposedPorts(ports, cfg) | ||
testutil.CheckErrorAndDeepEqual(t, false, nil, expectedPorts, cfg.ExposedPorts) | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you may also have to make sure that a specified protocol is valid
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we throw an error when we find an invalid protocol? or just ignore it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yah, let's throw an error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.