Skip to content
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
merged 4 commits into from
Mar 20, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ func GetCommand(cmd instructions.Command) (DockerCommand, error) {
switch c := cmd.(type) {
case *instructions.RunCommand:
return &RunCommand{cmd: c}, nil
case *instructions.ExposeCommand:
return &ExposeCommand{cmd: c}, nil
case *instructions.EnvCommand:
return &EnvCommand{cmd: c}, nil
}
Expand Down
40 changes: 40 additions & 0 deletions pkg/commands/expose.go
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, "/") {
Copy link
Collaborator

@priyawadhwa priyawadhwa Mar 20, 2018

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

Copy link
Contributor Author

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?

Copy link
Collaborator

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

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...), " ")
}
30 changes: 30 additions & 0 deletions pkg/commands/expose_test.go
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": {},
Copy link
Collaborator

Choose a reason for hiding this comment

The 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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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)
}