clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-08 15:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6130 from vieux/standardize_api_keys

Browse Source 
Standardize api keys to CamelCase
This commit is contained in:
Michael Crosby
2014-06-02 12:03:11 -07:00
parent 43b7af1dd1 1dd02ff4a0
commit 3e13aaec00
8 changed files with 92 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_build_test.go
+8 -8
View File
@@ -614,7 +614,7 @@ func TestBuildWithVolume(t *testing.T) {
VOLUME /test
`,
"testbuildimg",
"{{json .config.Volumes}}",
"{{json .Config.Volumes}}",
`{"/test":{}}`)
deleteImages("testbuildimg")
@@ -628,7 +628,7 @@ func TestBuildMaintainer(t *testing.T) {
MAINTAINER dockerio
`,
"testbuildimg",
"{{json .author}}",
"{{json .Author}}",
`"dockerio"`)
deleteImages("testbuildimg")
@@ -644,7 +644,7 @@ func TestBuildUser(t *testing.T) {
RUN [ $(whoami) = 'dockerio' ]
`,
"testbuildimg",
"{{json .config.User}}",
"{{json .Config.User}}",
`"dockerio"`)
deleteImages("testbuildimg")
@@ -664,7 +664,7 @@ func TestBuildRelativeWorkdir(t *testing.T) {
RUN [ "$PWD" = '/test2/test3' ]
`,
"testbuildimg",
"{{json .config.WorkingDir}}",
"{{json .Config.WorkingDir}}",
`"/test2/test3"`)
deleteImages("testbuildimg")
@@ -679,7 +679,7 @@ func TestBuildEnv(t *testing.T) {
RUN [ $(env | grep PORT) = 'PORT=4243' ]
`,
"testbuildimg",
"{{json .config.Env}}",
"{{json .Config.Env}}",
`["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PORT=4243"]`)
deleteImages("testbuildimg")
@@ -693,7 +693,7 @@ func TestBuildCmd(t *testing.T) {
CMD ["/bin/echo", "Hello World"]
`,
"testbuildimg",
"{{json .config.Cmd}}",
"{{json .Config.Cmd}}",
`["/bin/echo","Hello World"]`)
deleteImages("testbuildimg")
@@ -708,7 +708,7 @@ func TestBuildExpose(t *testing.T) {
`,
"testbuildimg",
"{{json .config.ExposedPorts}}",
"{{json .Config.ExposedPorts}}",
`{"4243/tcp":{}}`)
deleteImages("testbuildimg")
@@ -722,7 +722,7 @@ func TestBuildEntrypoint(t *testing.T) {
ENTRYPOINT ["/bin/echo"]
`,
"testbuildimg",
"{{json .config.Entrypoint}}",
"{{json .Config.Entrypoint}}",
`["/bin/echo"]`)
deleteImages("testbuildimg")
integration-cli/docker_cli_tag_test.go
+1 -1
View File
@@ -27,7 +27,7 @@ func TestTagUnprefixedRepoByName(t *testing.T) {
// tagging an image by ID in a new unprefixed repo should work
func TestTagUnprefixedRepoByID(t *testing.T) {
getIDCmd := exec.Command(dockerBinary, "inspect", "-f", "{{.id}}", "busybox")
getIDCmd := exec.Command(dockerBinary, "inspect", "-f", "{{.Id}}", "busybox")
out, _, err := runCommandWithOutput(getIDCmd)
errorOut(err, t, fmt.Sprintf("failed to get the image ID of busybox: %v", err))