docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
12,953 Commits 12 Branches 295 Tags
167e1b82bf6610ec00f417b1dfb80976bc269a9a
Commit Graph

743 Commits

Author SHA1 Message Date
Tibor Vass
3ba1373e01 builder: prevent Dockerfile to leave build context 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 73d5baf585e3ef55864abeef43d45fe0b3a1c2bc
Component: engine
 2015-02-02 23:40:24 -08:00
Doug Davis
56a2a654e8 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>
Upstream-commit: 198ff76de59a600ce900497fd4a6131ee4448c48
Component: engine
 2015-02-02 23:40:20 -08:00
Alexander Morozov
3ae87a3a28 Fix some go vet errors 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4ee05a4d3e6f9ad955d96075a1e63d59ed73ac78
Component: engine
 2015-02-02 14:53:20 -08:00
Michael Crosby
c8bbb49221 Merge pull request #10455 from ashahab-altiscale/9875-lxc-symlink 
Fixes symlink, container size, and kmsg tests
Upstream-commit: 382f187b1a4d038b45d0e7965a0af8e158a2e9da
Component: engine
 2015-02-02 13:13:27 -08:00
Arnaud Porterie
0820460272 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>
Upstream-commit: de8ea06d7dab7c5278f84728f7e0aa69e3301ad0
Component: engine
 2015-01-31 11:31:41 -08:00
Derek McGowan
12b02aa7f6 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 403d981d70dc8a493a9a10be4b5d2e2ce871f380
Component: engine
 2015-01-30 14:20:32 -08:00
Abin Shahab
764888405b 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)
Upstream-commit: 29ac29a4361e0392979ad6a99341bff174f76967
Component: engine
 2015-01-30 09:30:42 +00:00
Jessie Frazelle
78452ce653 Merge pull request #10446 from dmcgowan/defer-key-file-creation 
Defer creation of trust key file until needed
Upstream-commit: d748ec31d5f89f4cbe363ac9b38310906bf2a9e0
Component: engine
 2015-01-29 15:23:35 -08:00
Derek McGowan
eb1117987a Defer creation of trust key file until needed 
Fixes #10442

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0eed1f4d8da893d7c91be811197032a064053155
Component: engine
 2015-01-29 13:46:12 -08:00
Tibor Vass
09a29b4b64 Merge pull request #10368 from jfrazelle/lingering-exec-test 
Move one last exec test :)
Upstream-commit: fb9363eb2a859684aefc46d5854f05ed02e74bcf
Component: engine
 2015-01-28 21:21:05 -05:00
Tibor Vass
c60988becd Merge pull request #10123 from duglin/Issue10097 
Build CMD/ENTRYPOINT cache strings properly
Upstream-commit: 70fbd45a5c88f6f39a07b04f81a07721bf5f3eed
Component: engine
 2015-01-28 14:43:16 -05:00
Jessica Frazelle
e7f0104567 Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6a2c6e971d8b760931402e15513e91c71cba4b72
Component: engine
 2015-01-26 17:17:08 -08:00
Brian Goff
c124b59c51 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b54305ae2330bcadd2ef657a17f4a87896031d1f
Component: engine
 2015-01-26 15:22:32 -05:00
Arnaud Porterie
68915fde41 Merge pull request #10335 from euank/EmptyLayerConfig 
Allow empty layer configs in manifests
Upstream-commit: 74014e4a92fc600259605e4201ea6a70b4e623d3
Component: engine
 2015-01-26 11:53:36 -08:00
Michael Crosby
00cef48e11 Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code 
Adds ipc namespace capability to lxc, and fixes tests.
Upstream-commit: 364c64cf1aa912ea8197caa6b23b96e20ead64fb
Component: engine
 2015-01-26 11:21:48 -08:00
Euan
3bf93236d1 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>
Upstream-commit: d477d42dd3e6a98f82c6ed2abb1dfeeb2782539f
Component: engine
 2015-01-24 14:27:37 -08:00
Jessica Frazelle
36ea1c732a Move links exec test & exec dir test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 43d1c2010125e3c1ef1013ee2e8b4d9371d70d77
Component: engine
 2015-01-23 16:20:46 -08:00
Jessica Frazelle
34351a6734 Add build flag to exec test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ecdbc1a0aff40fa28389d1971528641e2824e5a9
Component: engine
 2015-01-23 16:18:39 -08:00
Jessica Frazelle
3e848a2a63 Move InspectExecID test to exec. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 957cbdbf302750f3fb3467237bebf29d87234208
Component: engine
 2015-01-23 16:18:39 -08:00
Jessie Frazelle
da0e87ebb9 Merge pull request #10288 from tiborvass/fix-test-attach 
integration-cli: wait for container before sending ^D
Upstream-commit: 54ddb9b41d550fea021efb9f77b7993acf3d6f75
Component: engine
 2015-01-22 15:07:46 -08:00
Tibor Vass
551d8c12b8 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a124bfaef37a9d209de881325dbe653d9b07ef4d
Component: engine
 2015-01-22 17:28:35 -05:00
Arnaud Porterie
a5a927b102 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
Upstream-commit: 5a6f84ce089f7a562010564ad7e2ebcb60a39d5d
Component: engine
 2015-01-22 13:17:23 -08:00
Arnaud Porterie
7a156f1702 Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
Upstream-commit: 10ab6dcb4f8f63ffab44023d286403c494fa24b8
Component: engine
 2015-01-22 11:54:03 -08:00
Tibor Vass
4cb12b37f1 integration-cli: Fix race in restart loop 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
 2015-01-22 14:06:24 -05:00
Derek McGowan
54a3834558 Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 42612ff6dba2d885a0c55af80128201a4d5166cb
Component: engine
 2015-01-22 10:51:04 -08:00
Derek McGowan
d625ce9494 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab
Component: engine
 2015-01-22 10:29:15 -08:00
Alexander Morozov
d18e557951 Merge pull request #10250 from crosbymichael/stats-test 
Improve robustness of /stats api test
Upstream-commit: 4aa60a902a03294d8009747f3fc1ba26bb2fd27e
Component: engine
 2015-01-22 09:09:03 -08:00
Derek McGowan
c5219e9048 Fix daemon key file location 
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5
Component: engine
 2015-01-21 16:28:19 -08:00
Jessica Frazelle
f6fc27f6b6 Add test for pull verified 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 614e09a8c7990e05509edb4c335c4b59001cea61
Component: engine
 2015-01-21 16:25:01 -08:00
Michael Crosby
9381b90c95 Improve robustness of /stats api test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4d7707e183e8dcb8e0ab1415e401cb530df17c92
Component: engine
 2015-01-21 16:00:15 -08:00
Jessie Frazelle
05dc63ed6e Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
Upstream-commit: f1bc0376b822128888a825c5607cee1d861e1c0b
Component: engine
 2015-01-21 15:08:45 -08:00
Alexander Morozov
0bd257dcc5 Test for updating linked hosts on restart 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 606c71d424cb21c8256968eb5d965a0855d1af2d
Component: engine
 2015-01-21 14:34:40 -08:00
Michael Crosby
32b5682b75 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
 2015-01-21 14:16:51 -08:00
Alexander Morozov
fdaa4278ca Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach 
Fix racey TestAttachAfterDetach
Upstream-commit: f72bcd336241ea5edbf25df6e3476d6afbd1b01d
Component: engine
 2015-01-21 09:20:24 -08:00
Brian Goff
d8af8d0b9f Fix racey TestAttachAfterDetach 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ef8057700b63e2c5fd5cec206915ef1f2088578
Component: engine
 2015-01-21 10:08:37 -05:00
Abin Shahab
3d77110890 Adds ipc namespace capability to lxc, and fixes tests. 
This fixes various tests by checking for non zero exit code, accounting for lxc-specific base-diffs, and by removing lxc specific environment vars.
It also adds the --share-ipc option to lxc-start for shared ipc namespaces.
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)
Upstream-commit: 3ca5af6b1ab6d1b75e014265e1ad4f5e45960826
Component: engine
 2015-01-21 06:08:00 +00:00
Michael Crosby
b793c28c03 Remove publisher if no one is listening 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 217a2bd1b62788e53fd38810b30672db58a4efc5
Component: engine
 2015-01-20 20:21:47 -08:00
Michael Crosby
a77fb96f4c Add documentation for stats feature 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
 2015-01-20 20:21:47 -08:00
Michael Crosby
ff8b2a1301 Merge pull request #10122 from dqminh/execin-wait-cgroup 
ExecIn process should wait for the parent signal before forking
Upstream-commit: 5f5e02d22c2bd9793e35eb982592c37a65f37674
Component: engine
 2015-01-20 18:02:14 -08:00
Brian Goff
d625d83871 Fix volume ref restore process 
Fixes #9629 #9768

A couple of issues:

1) Volume config is not restored if we couldn't find it with the graph
driver, but bind-mounts would never be found by the graph driver since
they aren't in that dir

2) container volumes were only being restored if they were found in the
volumes repo, but volumes created by old daemons wouldn't be in the
repo until the container is at least started.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e744b0dcbacd5e226fd79aba5a2e83f432d2d13f
Component: engine
 2015-01-20 15:54:56 -05:00
Tianon Gravi
c34a3e1187 Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support) 
This is literally the only failing test on Go 1.3.3: 🎉
```
--- FAIL: TestBuildWithTabs (0.43 seconds)
	docker_cli_build_test.go:4307: Missing tabs.
		Got:["/bin/sh","-c","echo\u0009one\u0009\u0009two"]
		Exp:["/bin/sh","-c","echo\tone\t\ttwo"]
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 142369456d2469a06e3860bdfe13169a908a3707
Component: engine
 2015-01-20 12:11:59 -07:00
Daniel, Dao Quang Minh
8d334a8cc4 test that execin cgroups match container cgroups 
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: 9462dbb242449b126ff473d081cec04afaa936d2
Component: engine
 2015-01-20 13:51:15 -05:00
Alexander Morozov
dbf7d610b8 Merge pull request #10005 from estesp/fix-localhost-nameserver-cleanup 
Clean up localhost resolv logic and add IPv6 support to regexp
Upstream-commit: e9d3e237e5cffef0dfcd4949c31959cd25863f3f
Component: engine
 2015-01-20 10:30:06 -08:00
Michael Crosby
73a96089ff Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links 
LXC needs stdin for container to remain up
Upstream-commit: 7b48488c5641f092e111aa9d5562b368f7e66711
Component: engine
 2015-01-19 17:13:37 -08:00
Phil Estes
5e93ebec1e Clean up localhost resolv logic and add IPv6 support to regexp 
Addresses #5811

This cleans up an error in the logic which removes localhost resolvers
from the host resolv.conf at container creation start time. Specifically
when the determination is made if any nameservers are left after
removing localhost resolvers, it was using a string match on the word
"nameserver", which could have been anywhere (including commented out)
leading to incorrect situations where no nameservers were left but the
default ones were not added.

This also adds some complexity to the regular expressions for finding
nameservers in general, as well as matching on localhost resolvers due
to the recent addition of IPv6 support.  Because of IPv6 support now
available in the Docker daemon, the resolvconf code is now aware of
IPv6 enable/disable state and uses that for both filter/cleaning of
nameservers as well as adding default Google DNS (IPv4 only vs. IPv4
and IPv6 if IPv6 enabled).  For all these changes, tests have been
added/strengthened to test these additional capabilities.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 93d51e5e971e001d80e9ffa863439f2d72215b5a
Component: engine
 2015-01-19 19:35:55 -05:00
Tibor Vass
1a5071a250 Merge pull request #9826 from icecrime/8318_whitespace_add_copy 
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
 2015-01-19 18:37:53 -05:00
Jessie Frazelle
1d078b8407 Merge pull request #9730 from cpuguy83/9709_fix_volumes_from_missing_container 
Fix volumes-from re-applying on each start
Upstream-commit: 9b4cd01b21a2553c46d5735d827d7b0f570e6cad
Component: engine
 2015-01-19 14:00:53 -08:00
Michael Crosby
eeb5a0ad4a Merge pull request #9968 from HuKeping/master 
log: Add restart policy name to the inspect information of container
Upstream-commit: 4c38045be1deed08bc1494261fd9a3e2812e67ad
Component: engine
 2015-01-19 11:08:32 -08:00
Jessie Frazelle
b098aaedce Merge pull request #9784 from dmcgowan/v2-registry 
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
 2015-01-19 10:46:38 -08:00
Michael Crosby
3f7b51a04e Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all 
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
 2015-01-19 10:46:22 -08:00