0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
45209 commits 14 branches 412 tags 338 MiB
Commit graph

5489 commits

Author SHA1 Message Date
Jessica Frazelle
0c87424007 Cleanup errorOut resp in save tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
0e3744ec89 Cleanup errorOut resp in rmi tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
ac24cabd9d Cleanup errorOut resp in inspect tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
d33f2bdb11 Cleanup errorOut resp in ps tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
ef787eb824 Cleanup errorOut resp in search tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
73eadbc6a1 Cleanup errorOut resp in docker_utils.go 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:06:16 -07:00
Jessica Frazelle
ac62c5439a Cleanup errorOut resp in diff test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
7d38ae7041 Cleanup errorOut resp in links test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
f7b3a6b292 Cleanup errorOut resp in history test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
b59d5a9dd2 Cleanup errorOut resp in info test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
0faf87598f Cleanup errorOut resp in kill test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
17842840ec Cleanup errorOut resp in nat test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
6b858b59ed Cleanup errorOut resp in create test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
475235ba7e Cleanup errorOut resp in tag test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
b645df1d39 Cleanup errorOut resp in export test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
88d65cbdf4 Cleanup errorOut resp in port test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
3182ee5c9b Cleanup errorOut resp in commit test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Cleanup errorOut resp in commit test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-16 15:05:00 -07:00
Doug Davis
9edf967824 Add failing testcase for single quotes in CMD 
Closes #5701

This is due to @SvenDowideit comment at: https://github.com/docker/docker/issues/5701#issuecomment-58133541
where he asked for a testcase showing the error case.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-10-16 14:40:55 -07:00
Phil Estes
d8cd8165a9 Migrate container GET API tests from integration to integration-cli 
An initial start to migration of the API tests from integration to
the integration-cli model.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(github: estesp)
 2014-10-16 17:34:28 -04:00
Michael Crosby
b3cda9fc7e Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q 
Cleanup: integration-cli ('%s' with %q)
 2014-10-16 13:51:46 -07:00
Jessica Frazelle
3893e220e8 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-10-16 11:52:14 -07:00
Alexandr Morozov
fcfe80f633 Minor fix of tests names 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-14 11:47:01 -07:00
Alexandr Morozov
fbaa41b5aa Add logDone for TestBuildAddSingleFileToNonExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-14 11:17:41 -07:00
Jessica Frazelle
949ab47710 Replace '%s' in test utils 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:38 -07:00
Jessica Frazelle
c091397d51 Replace '%s' in run tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:19 -07:00
Jessica Frazelle
be31a66b7a Replace '%s' in rm tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:11 -07:00
Jessica Frazelle
a44296603f Replace '%s' in diff tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:59:01 -07:00
Jessica Frazelle
91f33fcaaa Replace '%s' in create tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-14 10:58:35 -07:00
Tianon Gravi
24189b2c36 Fix builder from being over-aggressive on ${} 
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.

I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).

I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄

Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-10-14 00:58:55 -06:00
Erik Hollensbe
1150c1639a builder: ONBUILD triggers were not accurately being executed in JSON cases. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-14 01:59:45 +00:00
Victor Vieux
72d8d94284 Merge pull request #8497 from aluzzardi/disable-stable-ip 
Disable stable IPs.
 2014-10-09 15:54:33 -07:00
Andrea Luzzardi
5b8379a434 Disable stable IPs. 
Stable IPs causes some regressions in the way people use Docker, see GH#8493.

Reverting it for 1.3, we'll enable it back for the next release.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2014-10-09 15:15:17 -07:00
Jessica Frazelle
b66ac6a809 Revert "Fix line delimited JSON response" 
This reverts commit d2f75a3040.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-09 13:46:21 -07:00
Michael Crosby
4eb812e042 Merge pull request #8457 from jfrazelle/pr_8455 
Check /etc/resolv.conf every time for 127.* content
 2014-10-08 16:21:14 -07:00
Jessica Frazelle
dbe6c6651e cleanup resolve.conf code 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-08 15:15:51 -07:00
Michael Crosby
0486bd022e Merge pull request #8450 from dqminh/fix-proxy-exit 
dont close proxy's stdout/stderr prematurely
 2014-10-08 14:20:33 -07:00
Andrea Luzzardi
d7bcc099be Merge pull request #8475 from cpuguy83/fix_create_phantom_volumes_on_container_restart 
Fixes re-creating volume on (re)start
 2014-10-08 13:58:56 -07:00
Brian Goff
c985302c5c Fixes re-creating volume on (re)start 
When a container is restarted all the volume configs are parsed again.
Even if the volume was already handled in a previous start it was still
calling "FindOrCreateVolume" on the volume repo causing a new volume to
be created.

This wasn't being detected because as part of the mount initialization
it checks to see if the the _mount_ was already initialized, but this
happens after the parsing of the configs.
So a check is added during parsing to skip a volume which was already
created for that container.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-10-08 16:25:51 -04:00
Brian Goff
9acf7c765c Restore volume refs after daemon restart 
Volume refs were not being restored on daemon restart.
This made it possible to remove a volume being used by other containers
after a daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-10-08 14:17:27 -04:00
Daniel, Dao Quang Minh
3b9d88210e pass extra file to child process as status handler 
When stdout/stderr is closed prematurely, the proxy's writes to stdout/stderr
(i.e. `log.Errorf/log.Printf`) will returns with EPIPE error, and go runtime
will terminate the proxy when stdout/stderr writes trigger 10 EPIPE errors.

instead of using stdout/stderr as the status handler, we pass an extra file to
the child process and write `0\n` or `1\nerror message` to it and close it
after. This allow the child process to handle stdout/stderr as normal.

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-10-08 12:53:43 -04:00
Jessica Frazelle
de32f48e66 Fix Tag Test for longer tags 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-07 19:37:08 -07:00
Jessica Frazelle
acd511786e Test for check /etc/resolv.conf on every docker run for 127.* content. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-07 16:51:51 -07:00
Michael Crosby
50fa9dffcf Allow child to overwrite entrypoint from parent 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-07 23:45:35 +00:00
Jessie Frazelle
12203e475d Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions 
Ignore unknown dockerfile instructions
 2014-10-07 14:45:51 -07:00
Sven Dowideit
40cad37f0a Merge pull request #8341 from unclejack/add_workdir_test 
add test for workdir env vars and add docs
 2014-10-07 14:27:32 +10:00
Tibor Vass
9fe1dd3103 Add test for ignoring invalid dockerfile instructions 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-06 23:14:25 -04:00
Alexandr Morozov
a650ab7f29 Merge pull request #8409 from unclejack/integcli_lint 
integcli: lint fixes
 2014-10-06 14:32:08 -07:00
unclejack
c0e632246d integcli: lint fixes 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-10-06 23:15:17 +03:00
Victor Vieux
6157af8292 Merge pull request #8416 from LK4D4/fix_build_cache_test 
Fix TestBuildCacheADD to check cache in out, not in id
 2014-10-06 11:56:18 -07:00
Michael Crosby
128c52f583 Merge pull request #8417 from cpuguy83/8398_fix_automatic_data_copy_for_volumesfrom 
volumes copying data unexpectedly
 2014-10-06 11:43:41 -07:00