mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
1d92789b4f
sed -E -i 's#\bcheck\.C\b#testing.T#g' \ -- "integration-cli/check_test.go" "integration-cli/daemon/daemon.go" "integration-cli/daemon/daemon_swarm.go" "integration-cli/daemon_swarm_hack_test.go" "integration-cli/docker_api_attach_test.go" "integration-cli/docker_api_build_test.go" "integration-cli/docker_api_build_windows_test.go" "integration-cli/docker_api_containers_test.go" "integration-cli/docker_api_containers_windows_test.go" "integration-cli/docker_api_exec_resize_test.go" "integration-cli/docker_api_exec_test.go" "integration-cli/docker_api_images_test.go" "integration-cli/docker_api_inspect_test.go" "integration-cli/docker_api_logs_test.go" "integration-cli/docker_api_network_test.go" "integration-cli/docker_api_stats_test.go" "integration-cli/docker_api_swarm_node_test.go" "integration-cli/docker_api_swarm_service_test.go" "integration-cli/docker_api_swarm_test.go" "integration-cli/docker_api_test.go" "integration-cli/docker_cli_attach_test.go" "integration-cli/docker_cli_attach_unix_test.go" "integration-cli/docker_cli_build_test.go" "integration-cli/docker_cli_build_unix_test.go" "integration-cli/docker_cli_by_digest_test.go" "integration-cli/docker_cli_commit_test.go" "integration-cli/docker_cli_cp_from_container_test.go" "integration-cli/docker_cli_cp_test.go" "integration-cli/docker_cli_cp_to_container_test.go" "integration-cli/docker_cli_cp_to_container_unix_test.go" "integration-cli/docker_cli_cp_utils_test.go" "integration-cli/docker_cli_create_test.go" "integration-cli/docker_cli_daemon_plugins_test.go" "integration-cli/docker_cli_daemon_test.go" "integration-cli/docker_cli_events_test.go" "integration-cli/docker_cli_events_unix_test.go" "integration-cli/docker_cli_exec_test.go" "integration-cli/docker_cli_exec_unix_test.go" "integration-cli/docker_cli_external_volume_driver_unix_test.go" "integration-cli/docker_cli_health_test.go" "integration-cli/docker_cli_history_test.go" "integration-cli/docker_cli_images_test.go" "integration-cli/docker_cli_import_test.go" "integration-cli/docker_cli_info_test.go" "integration-cli/docker_cli_info_unix_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_links_test.go" "integration-cli/docker_cli_login_test.go" "integration-cli/docker_cli_logout_test.go" "integration-cli/docker_cli_logs_test.go" "integration-cli/docker_cli_netmode_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_plugins_logdriver_test.go" "integration-cli/docker_cli_plugins_test.go" "integration-cli/docker_cli_port_test.go" "integration-cli/docker_cli_proxy_test.go" "integration-cli/docker_cli_prune_unix_test.go" "integration-cli/docker_cli_ps_test.go" "integration-cli/docker_cli_pull_local_test.go" "integration-cli/docker_cli_pull_test.go" "integration-cli/docker_cli_push_test.go" "integration-cli/docker_cli_registry_user_agent_test.go" "integration-cli/docker_cli_restart_test.go" "integration-cli/docker_cli_rmi_test.go" "integration-cli/docker_cli_run_test.go" "integration-cli/docker_cli_run_unix_test.go" "integration-cli/docker_cli_save_load_test.go" "integration-cli/docker_cli_save_load_unix_test.go" "integration-cli/docker_cli_search_test.go" "integration-cli/docker_cli_service_create_test.go" "integration-cli/docker_cli_service_health_test.go" "integration-cli/docker_cli_service_logs_test.go" "integration-cli/docker_cli_service_scale_test.go" "integration-cli/docker_cli_sni_test.go" "integration-cli/docker_cli_start_test.go" "integration-cli/docker_cli_stats_test.go" "integration-cli/docker_cli_swarm_test.go" "integration-cli/docker_cli_swarm_unix_test.go" "integration-cli/docker_cli_top_test.go" "integration-cli/docker_cli_update_unix_test.go" "integration-cli/docker_cli_userns_test.go" "integration-cli/docker_cli_v2_only_test.go" "integration-cli/docker_cli_volume_test.go" "integration-cli/docker_deprecated_api_v124_test.go" "integration-cli/docker_deprecated_api_v124_unix_test.go" "integration-cli/docker_hub_pull_suite_test.go" "integration-cli/docker_utils_test.go" "integration-cli/events_utils_test.go" "integration-cli/fixtures_linux_daemon_test.go" "integration-cli/utils_test.go" "pkg/discovery/discovery_test.go" "pkg/discovery/file/file_test.go" "pkg/discovery/generator_test.go" "pkg/discovery/kv/kv_test.go" "pkg/discovery/memory/memory_test.go" "pkg/discovery/nodes/nodes_test.go" Signed-off-by: Tibor Vass <tibor@docker.com>
167 lines
5.8 KiB
Go
167 lines
5.8 KiB
Go
package main
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types/versions"
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/cli"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestCommitAfterContainerIsDone(c *testing.T) {
|
|
out := cli.DockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo").Combined()
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
cli.DockerCmd(c, "wait", cleanedContainerID)
|
|
|
|
out = cli.DockerCmd(c, "commit", cleanedContainerID).Combined()
|
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
|
|
|
cli.DockerCmd(c, "inspect", cleanedImageID)
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitWithoutPause(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "wait", cleanedContainerID)
|
|
|
|
out, _ = dockerCmd(c, "commit", "-p=false", cleanedContainerID)
|
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "inspect", cleanedImageID)
|
|
}
|
|
|
|
//test commit a paused container should not unpause it after commit
|
|
func (s *DockerSuite) TestCommitPausedContainer(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
out, _ := dockerCmd(c, "run", "-i", "-d", "busybox")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "pause", cleanedContainerID)
|
|
dockerCmd(c, "commit", cleanedContainerID)
|
|
|
|
out = inspectField(c, cleanedContainerID, "State.Paused")
|
|
// commit should not unpause a paused container
|
|
assert.Assert(c, out, checker.Contains, "true")
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitNewFile(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "committer", "busybox", "/bin/sh", "-c", "echo koye > /foo")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "committer")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
out, _ := dockerCmd(c, "run", imageID, "cat", "/foo")
|
|
actual := strings.TrimSpace(out)
|
|
assert.Assert(c, actual, checker.Equals, "koye")
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitHardlink(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
firstOutput, _ := dockerCmd(c, "run", "-t", "--name", "hardlinks", "busybox", "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2")
|
|
|
|
chunks := strings.Split(strings.TrimSpace(firstOutput), " ")
|
|
inode := chunks[0]
|
|
chunks = strings.SplitAfterN(strings.TrimSpace(firstOutput), " ", 2)
|
|
assert.Assert(c, chunks[1], checker.Contains, chunks[0], check.Commentf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:]))
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "hardlinks", "hardlinks")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
secondOutput, _ := dockerCmd(c, "run", "-t", imageID, "ls", "-di", "file1", "file2")
|
|
|
|
chunks = strings.Split(strings.TrimSpace(secondOutput), " ")
|
|
inode = chunks[0]
|
|
chunks = strings.SplitAfterN(strings.TrimSpace(secondOutput), " ", 2)
|
|
assert.Assert(c, chunks[1], checker.Contains, chunks[0], check.Commentf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:]))
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitTTY(c *testing.T) {
|
|
dockerCmd(c, "run", "-t", "--name", "tty", "busybox", "/bin/ls")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "tty", "ttytest")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
dockerCmd(c, "run", imageID, "/bin/ls")
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitWithHostBindMount(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
dockerCmd(c, "run", "--name", "bind-commit", "-v", "/dev/null:/winning", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "bind-commit", "bindtest")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
dockerCmd(c, "run", imageID, "true")
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitChange(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "test", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit",
|
|
"--change", "EXPOSE 8080",
|
|
"--change", "ENV DEBUG true",
|
|
"--change", "ENV test 1",
|
|
"--change", "ENV PATH /foo",
|
|
"--change", "LABEL foo bar",
|
|
"--change", "CMD [\"/bin/sh\"]",
|
|
"--change", "WORKDIR /opt",
|
|
"--change", "ENTRYPOINT [\"/bin/sh\"]",
|
|
"--change", "USER testuser",
|
|
"--change", "VOLUME /var/lib/docker",
|
|
"--change", "ONBUILD /usr/local/bin/python-build --dir /app/src",
|
|
"test", "test-commit")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
expectedEnv := "[DEBUG=true test=1 PATH=/foo]"
|
|
// bug fixed in 1.36, add min APi >= 1.36 requirement
|
|
// PR record https://github.com/moby/moby/pull/35582
|
|
if versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.35") && testEnv.OSType != "windows" {
|
|
// The ordering here is due to `PATH` being overridden from the container's
|
|
// ENV. On windows, the container doesn't have a `PATH` ENV variable so
|
|
// the ordering is the same as the cli.
|
|
expectedEnv = "[PATH=/foo DEBUG=true test=1]"
|
|
}
|
|
|
|
prefix, slash := getPrefixAndSlashFromDaemonPlatform()
|
|
prefix = strings.ToUpper(prefix) // Force C: as that's how WORKDIR is normalized on Windows
|
|
expected := map[string]string{
|
|
"Config.ExposedPorts": "map[8080/tcp:{}]",
|
|
"Config.Env": expectedEnv,
|
|
"Config.Labels": "map[foo:bar]",
|
|
"Config.Cmd": "[/bin/sh]",
|
|
"Config.WorkingDir": prefix + slash + "opt",
|
|
"Config.Entrypoint": "[/bin/sh]",
|
|
"Config.User": "testuser",
|
|
"Config.Volumes": "map[/var/lib/docker:{}]",
|
|
"Config.OnBuild": "[/usr/local/bin/python-build --dir /app/src]",
|
|
}
|
|
|
|
for conf, value := range expected {
|
|
res := inspectField(c, imageID, conf)
|
|
if res != value {
|
|
c.Errorf("%s('%s'), expected %s", conf, res, value)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestCommitChangeLabels(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "test", "--label", "some=label", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit",
|
|
"--change", "LABEL some=label2",
|
|
"test", "test-commit")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
assert.Assert(c, inspectField(c, imageID, "Config.Labels"), checker.Equals, "map[some:label2]")
|
|
// check that container labels didn't change
|
|
assert.Assert(c, inspectField(c, "test", "Config.Labels"), checker.Equals, "map[some:label]")
|
|
}
|