-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from priyawadhwa/cmd
CMD and ENTRYPOINT command
- Loading branch information
Showing
8 changed files
with
273 additions
and
0 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
FROM gcr.io/distroless/base:latest | ||
CMD ["command", "one"] | ||
CMD ["command", "two"] | ||
CMD echo "hello" | ||
|
||
ENTRYPOINT ["execute", "something"] | ||
ENTRYPOINT ["execute", "entrypoint"] |
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,4 @@ | ||
schemaVersion: '2.0.0' | ||
metadataTest: | ||
cmd: ["/bin/sh", "-c", "echo \"hello\""] | ||
entrypoint: ["execute", "entrypoint"] |
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,65 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package commands | ||
|
||
import ( | ||
"github.com/containers/image/manifest" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"github.com/sirupsen/logrus" | ||
"strings" | ||
) | ||
|
||
type CmdCommand struct { | ||
cmd *instructions.CmdCommand | ||
} | ||
|
||
// ExecuteCommand executes the CMD command | ||
// Argument handling is the same as RUN. | ||
func (c *CmdCommand) ExecuteCommand(config *manifest.Schema2Config) error { | ||
logrus.Info("cmd: CMD") | ||
var newCommand []string | ||
if c.cmd.PrependShell { | ||
// This is the default shell on Linux | ||
// TODO: Support shell command here | ||
shell := []string{"/bin/sh", "-c"} | ||
newCommand = append(shell, strings.Join(c.cmd.CmdLine, " ")) | ||
} else { | ||
newCommand = c.cmd.CmdLine | ||
} | ||
|
||
logrus.Infof("Replacing CMD in config with %v", newCommand) | ||
config.Cmd = newCommand | ||
return nil | ||
} | ||
|
||
// FilesToSnapshot returns an empty array since this is a metadata command | ||
func (c *CmdCommand) FilesToSnapshot() []string { | ||
return []string{} | ||
} | ||
|
||
// CreatedBy returns some information about the command for the image config history | ||
func (c *CmdCommand) CreatedBy() string { | ||
cmd := []string{"CMD"} | ||
cmdLine := strings.Join(c.cmd.CmdLine, " ") | ||
if c.cmd.PrependShell { | ||
// TODO: Support shell command here | ||
shell := []string{"/bin/sh", "-c"} | ||
appendedShell := append(cmd, shell...) | ||
return strings.Join(append(appendedShell, cmdLine), " ") | ||
} | ||
return strings.Join(append(cmd, cmdLine), " ") | ||
} |
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,61 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
package commands | ||
|
||
import ( | ||
"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||
"github.com/containers/image/manifest" | ||
"github.com/containers/image/pkg/strslice" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"testing" | ||
) | ||
|
||
var cmdTests = []struct { | ||
prependShell bool | ||
cmdLine []string | ||
expectedCmd strslice.StrSlice | ||
}{ | ||
{ | ||
prependShell: true, | ||
cmdLine: []string{"echo", "cmd1"}, | ||
expectedCmd: strslice.StrSlice{"/bin/sh", "-c", "echo cmd1"}, | ||
}, | ||
{ | ||
prependShell: false, | ||
cmdLine: []string{"echo", "cmd2"}, | ||
expectedCmd: strslice.StrSlice{"echo", "cmd2"}, | ||
}, | ||
} | ||
|
||
func TestExecuteCmd(t *testing.T) { | ||
|
||
cfg := &manifest.Schema2Config{ | ||
Cmd: nil, | ||
} | ||
|
||
for _, test := range cmdTests { | ||
cmd := CmdCommand{ | ||
&instructions.CmdCommand{ | ||
ShellDependantCmdLine: instructions.ShellDependantCmdLine{ | ||
PrependShell: test.prependShell, | ||
CmdLine: test.cmdLine, | ||
}, | ||
}, | ||
} | ||
err := cmd.ExecuteCommand(cfg) | ||
testutil.CheckErrorAndDeepEqual(t, false, err, test.expectedCmd, cfg.Cmd) | ||
} | ||
} |
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,64 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package commands | ||
|
||
import ( | ||
"github.com/containers/image/manifest" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"github.com/sirupsen/logrus" | ||
"strings" | ||
) | ||
|
||
type EntrypointCommand struct { | ||
cmd *instructions.EntrypointCommand | ||
} | ||
|
||
// ExecuteCommand handles command processing similar to CMD and RUN, | ||
func (e *EntrypointCommand) ExecuteCommand(config *manifest.Schema2Config) error { | ||
logrus.Info("cmd: ENTRYPOINT") | ||
var newCommand []string | ||
if e.cmd.PrependShell { | ||
// This is the default shell on Linux | ||
// TODO: Support shell command here | ||
shell := []string{"/bin/sh", "-c"} | ||
newCommand = append(shell, strings.Join(e.cmd.CmdLine, " ")) | ||
} else { | ||
newCommand = e.cmd.CmdLine | ||
} | ||
|
||
logrus.Infof("Replacing Entrypoint in config with %v", newCommand) | ||
config.Entrypoint = newCommand | ||
return nil | ||
} | ||
|
||
// FilesToSnapshot returns an empty array since this is a metadata command | ||
func (e *EntrypointCommand) FilesToSnapshot() []string { | ||
return []string{} | ||
} | ||
|
||
// CreatedBy returns some information about the command for the image config history | ||
func (e *EntrypointCommand) CreatedBy() string { | ||
entrypoint := []string{"ENTRYPOINT"} | ||
cmdLine := strings.Join(e.cmd.CmdLine, " ") | ||
if e.cmd.PrependShell { | ||
// TODO: Support shell command here | ||
shell := []string{"/bin/sh", "-c"} | ||
appendedShell := append(entrypoint, shell...) | ||
return strings.Join(append(appendedShell, cmdLine), " ") | ||
} | ||
return strings.Join(append(entrypoint, cmdLine), " ") | ||
} |
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,61 @@ | ||
/* | ||
Copyright 2018 Google LLC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
package commands | ||
|
||
import ( | ||
"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||
"github.com/containers/image/manifest" | ||
"github.com/containers/image/pkg/strslice" | ||
"github.com/docker/docker/builder/dockerfile/instructions" | ||
"testing" | ||
) | ||
|
||
var entrypointTests = []struct { | ||
prependShell bool | ||
cmdLine []string | ||
expectedCmd strslice.StrSlice | ||
}{ | ||
{ | ||
prependShell: true, | ||
cmdLine: []string{"echo", "cmd1"}, | ||
expectedCmd: strslice.StrSlice{"/bin/sh", "-c", "echo cmd1"}, | ||
}, | ||
{ | ||
prependShell: false, | ||
cmdLine: []string{"echo", "cmd2"}, | ||
expectedCmd: strslice.StrSlice{"echo", "cmd2"}, | ||
}, | ||
} | ||
|
||
func TestEntrypointExecuteCmd(t *testing.T) { | ||
|
||
cfg := &manifest.Schema2Config{ | ||
Cmd: nil, | ||
} | ||
|
||
for _, test := range entrypointTests { | ||
cmd := EntrypointCommand{ | ||
&instructions.EntrypointCommand{ | ||
ShellDependantCmdLine: instructions.ShellDependantCmdLine{ | ||
PrependShell: test.prependShell, | ||
CmdLine: test.cmdLine, | ||
}, | ||
}, | ||
} | ||
err := cmd.ExecuteCommand(cfg) | ||
testutil.CheckErrorAndDeepEqual(t, false, err, test.expectedCmd, cfg.Entrypoint) | ||
} | ||
} |