clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,059 Commits 9 Branches 112 Tags
b0ed2da4418d62d2d7b940b49e0e89bdcd264569
Commit Graph
759 Commits
Author SHA1 Message Date
Tibor Vass b0ed2da441 Merge pull request #10112 from cpuguy83/4393_fix_volume_where_file_exists 
Error out if file in container at volume path
 2015-02-06 19:39:48 -05:00
Jessie Frazelle 271a073a04 Merge pull request #10622 from estesp/10618-err-ondup-bind-vols 
Don't allow duplicate `-v` specifications for the same target
 2015-02-06 15:03:56 -08:00
Brian Goff c73e3bf4dc Error out if file in container at volume path 
Fixes #4393

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-06 18:00:00 -05:00
Michael Crosby eb79acd7a0 Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options 
Specifying -a and -d to docker run should throw an error
 2015-02-06 14:58:08 -08:00
Michael Crosby 9d140fe693 Merge pull request #10105 from LK4D4/remove_tons_of_names 
Use graphdb.Walk with depth=1 in /containers
 2015-02-06 14:33:26 -08:00
Alexander Morozov b6dc430d99 Merge pull request #10153 from acbodine/api_websocket_test 
Adds test for api attach via websocket
 2015-02-06 14:29:54 -08:00
Alexander Morozov 2a3225eb82 Test for links names in ps --no-trunc 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 14:05:08 -08:00
Phil Estes d1f33d12d4 Don't allow duplicate -v specifications for the same target 
Addresses: #10618

Given that the user has no notification that they tried to bind mount
different directories on the same target in the container, this errors
out in that case, without changing the current code allowing for
--volumes-from to trump -v/VOLUME specifications.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-06 17:00:53 -05:00
Tibor Vass a982432c16 Merge pull request #10601 from LK4D4/fix_tag_name_in_ps 
Show right tag for container in ps
 2015-02-06 16:59:49 -05:00
Tibor Vass 82191cc3f3 Merge pull request #10120 from duglin/TrimSpaces 
Remove leading/trailing spaces in builder/parser
 2015-02-06 16:25:37 -05:00
Doug Davis 969ba5c7ed Make checking of help text smarter 
As I was reworking https://github.com/docker/docker/pull/9402 I realized
that the new testcase I just added that verified all help text is within
80 characters really should be smarter and ask "docker help" for the list
of commands to check instead of having a hard-coded list.  This way
it will catch "docker execwait" automagically once #9402 is merged.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-06 13:02:58 -08:00
Alexander Morozov e45deceb46 Show right tag for container in ps 
Fixes #10599

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 11:32:01 -08:00
Doug Davis 3859c48531 Remove leading/trailing spaces in builder/parser 
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.

Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-06 08:52:18 -08:00
Doug Davis 2203b37733 Pretty the help text 
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-04 07:59:16 -08:00
Tibor Vass 73d5baf585 builder: prevent Dockerfile to leave build context 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-02-02 23:40:24 -08:00
Doug Davis 198ff76de5 Add an API test for docker build -f Dockerfile 
I noticed that while we have tests to make sure that people don't
specify a Dockerfile (via -f) that's outside of the build context
when using the docker cli, we don't check on the server side to make
sure that API users have the same check done. This would be a security
risk.

While in there I had to add a new util func for the tests to allow us to
send content to the server that isn't json encoded - in this case a tarball

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-02 23:40:20 -08:00
Alexander Morozov 4ee05a4d3e Fix some go vet errors 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-02 14:53:20 -08:00
Michael Crosby 382f187b1a Merge pull request #10455 from ashahab-altiscale/9875-lxc-symlink 
Fixes symlink, container size, and kmsg tests
 2015-02-02 13:13:27 -08:00
André Martins af90fe6a63 Fixes #10388 
The cmd.Lookup should be "-attach" and not "attach", as seen in
docker/docker/runconfig/parse.go

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-02-02 12:07:52 +00:00
Arnaud Porterie de8ea06d7d Fix race in test registry setup 
Wait for the local registry-v2 test instance to become available to
avoid random tests failures.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-01-31 11:31:41 -08:00
Derek McGowan 403d981d70 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-30 14:20:32 -08:00
Abin Shahab 29ac29a436 Fixes symlink, container size, and kmsg tests 
Changes symlink, container size and kmsg tests to account for lxc driver.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
 2015-01-30 09:30:42 +00:00
Jessie Frazelle d748ec31d5 Merge pull request #10446 from dmcgowan/defer-key-file-creation 
Defer creation of trust key file until needed
 2015-01-29 15:23:35 -08:00
Derek McGowan 0eed1f4d8d Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-29 13:46:12 -08:00
Tibor Vass fb9363eb2a Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
 2015-01-28 21:21:05 -05:00
Tibor Vass 70fbd45a5c Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
 2015-01-28 14:43:16 -05:00
Jessica Frazelle 6a2c6e971d Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-26 17:17:08 -08:00
Brian Goff b54305ae23 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-26 15:22:32 -05:00
Arnaud Porterie 74014e4a92 Merge pull request #10335 from euank/EmptyLayerConfig 
Allow empty layer configs in manifests
 2015-01-26 11:53:36 -08:00
Michael Crosby 364c64cf1a Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code 
Adds ipc namespace capability to lxc, and fixes tests.
 2015-01-26 11:21:48 -08:00
Euan d477d42dd3 Allow empty layer configs in manifests 
Before the V2 registry changes, images with no config could be pushed.
This change fixes a regression that made those images not able to be
pushed to a registry.

Signed-off-by: Euan Kemp <euank@euank.com>
 2015-01-24 14:27:37 -08:00
Jessica Frazelle 43d1c20101 Move links exec test & exec dir test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-23 16:20:46 -08:00
Jessica Frazelle ecdbc1a0af Add build flag to exec test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-23 16:18:39 -08:00
Jessica Frazelle 957cbdbf30 Move InspectExecID test to exec. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-23 16:18:39 -08:00
Jessie Frazelle 54ddb9b41d Merge pull request #10288 from tiborvass/fix-test-attach 
integration-cli: wait for container before sending ^D
 2015-01-22 15:07:46 -08:00
Tibor Vass a124bfaef3 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-01-22 17:28:35 -05:00
Arnaud Porterie 5a6f84ce08 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
 2015-01-22 13:17:23 -08:00
Arnaud Porterie 10ab6dcb4f Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
 2015-01-22 11:54:03 -08:00
Tibor Vass 752a0d6f34 integration-cli: Fix race in restart loop 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2015-01-22 14:06:24 -05:00
Derek McGowan 42612ff6db Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:51:04 -08:00
Derek McGowan a34a7930b5 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-22 10:29:15 -08:00
Alexander Morozov 4aa60a902a Merge pull request #10250 from crosbymichael/stats-test 
Improve robustness of /stats api test
 2015-01-22 09:09:03 -08:00
Andrew C. Bodine 9e37a04665 Adds test for api attach via websocket 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 18:35:51 -08:00
Derek McGowan 06af013f8b Fix daemon key file location 
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-21 16:28:19 -08:00
Jessica Frazelle 614e09a8c7 Add test for pull verified 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-21 16:25:01 -08:00
Michael Crosby 4d7707e183 Improve robustness of /stats api test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-21 16:00:15 -08:00
Jessie Frazelle f1bc0376b8 Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
 2015-01-21 15:08:45 -08:00
Alexander Morozov 606c71d424 Test for updating linked hosts on restart 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-21 14:34:40 -08:00
Michael Crosby edaf23b7a7 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
 2015-01-21 14:16:51 -08:00
Alexander Morozov f72bcd3362 Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach 
Fix racey TestAttachAfterDetach
 2015-01-21 09:20:24 -08:00