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,347 Commits 12 Branches 295 Tags
f4febcdfe1071d29ba461f9da9e37994d4bdec13
Commit Graph

633 Commits

Author SHA1 Message Date
Alexander Morozov
bb2e382254 Merge pull request #9097 from brahmaroutu/publish_ports_8899 
add ability to publish range of ports
Upstream-commit: 25f8c2664066a523f3f59f4cc5cdc8cf81c8a7c8
Component: engine
 2015-01-05 14:05:47 -08:00
Jessica Frazelle
1c38530502 Change url of robots.txt test to dockerproject.com 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 367e66e9721c33a64ab091bd5430ab4a9af12083
Component: engine
 2015-01-05 11:13:37 -08:00
Srini Brahmaroutu
986d8f11d2 add ability to publish range of ports 
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 2338a9cf5a1ba5576b92e49065335a9c9251ade0
Component: engine
 2015-01-02 23:21:26 +00:00
Alexander Morozov
a8c9181bdf Merge pull request #9800 from vieux/execIDs_inspect 
Add ExecIDs to docker inspect
Upstream-commit: 12fef2d8df4e5da024418e324f7e3c3e82220a27
Component: engine
 2014-12-29 15:32:33 -08:00
Victor Vieux
2156fea332 add test 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c0bb1c77ee2461f8bceb03202f60f5673815c026
Component: engine
 2014-12-29 23:00:17 +00:00
Jessie Frazelle
6f0f7a7c16 Merge pull request #9827 from LK4D4/test_for_removing_cgroups 
Test for issue #9699
Upstream-commit: d47020d18ab22a061982a56f4d0d90658ce5e66a
Component: engine
 2014-12-29 13:46:29 -08:00
Alexander Morozov
3e645815a0 Rewrite TestRunNetHost to compare namespaces 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e98c08a88fb5f3eedde158a3647a731c31bd4faa
Component: engine
 2014-12-29 13:10:30 -08:00
Alexander Morozov
94c4f7ea4b Fix done messages and error message for ipc tests 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 74ee405a27b19f2d91caaf50029cea3b13ddcaf2
Component: engine
 2014-12-29 13:10:16 -08:00
Jessie Frazelle
fc5a9d42ea Merge pull request #9796 from LK4D4/fix_test_daemon 
More graceful stop for testing daemon
Upstream-commit: 7156fb24427d48281892771eb9c6b3db10f361a3
Component: engine
 2014-12-29 10:01:32 -08:00
Alexandr Morozov
6ef319bb81 Test for host networking 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 732c94a502cbda9a60d76e7af83c0569e919cdb9
Component: engine
 2014-12-26 21:04:27 -08:00
Alexandr Morozov
81d2519112 Test for issue #9699 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: eda92e8834f0438ab4ec29fa26c66547279413e5
Component: engine
 2014-12-26 20:11:27 -08:00
Jessie Frazelle
936e8f916b Merge pull request #9779 from jfrazelle/9771-non-local-mac-address-test 
Add test for non local mac address.
Upstream-commit: b49d3dd588f0cfae8fc9bb226a2685fe4f4ccdc1
Component: engine
 2014-12-26 19:33:44 -07:00
Alexander Morozov
574dad0b9d Merge pull request #9792 from jfrazelle/9770-parse-exec-usage 
Return usage on parseExec error.
Upstream-commit: 819b715b8d7e3ab12be64c289055ae628ba46c08
Component: engine
 2014-12-26 17:45:55 -08:00
Jessica Frazelle
2ef01256f0 Add test for non local mac address. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 98d5720594d275071f43fbf90daf5fcd1166df8b
Component: engine
 2014-12-26 10:22:14 -08:00
Alexander Morozov
013643a0ba More graceful stop for testing daemon 
Fixes problem with TestDaemonAllocatesListeningPort

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8dc86c0e36da3d3206220fffc75004759dd5d2cb
Component: engine
 2014-12-23 13:15:19 -08:00
Jessica Frazelle
301d5a4920 Return usage on parseExec error. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7fdbd90f8805736aa78156faf7e6f8fdd2384af7
Component: engine
 2014-12-23 12:49:45 -08:00
Alexander Morozov
492ed0b266 Merge pull request #9583 from brahmaroutu/remove_container_9569 
Error should be 409 as the container is different state to remove
Upstream-commit: 1e2d0d17d98e25cd315a60ab6ca83c1662ebe649
Component: engine
 2014-12-23 10:09:58 -08:00
Jessie Frazelle
12ac4f3199 Merge pull request #9615 from unclejack/bump_go_to_1.4 
bump Go to 1.4
Upstream-commit: d09421a74fa268274c50308f2655e654949f505b
Component: engine
 2014-12-22 15:07:57 -08:00
Alexander Morozov
5364411768 Merge pull request #7003 from porjo/6034-fowardChain 
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
 2014-12-22 14:40:42 -08:00
Alexander Morozov
bc1cbc1f63 Fix TestBuildWithTabs for go 1.4 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a31c14cadca4052a0a141347b322d825f56b814b
Component: engine
 2014-12-21 13:49:45 +02:00
Ian Bishop
4b105a7583 Create tests for pkg/iptables 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 0da92633b4161ed1f8babe5ec4a9fe98257d34b5
Component: engine
 2014-12-21 12:57:32 +10:00
Arnaud Porterie
e61e114873 Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f3ed42286e7df3a35ca41a4d19fab2a53a08b382
Component: engine
 2014-12-20 16:40:40 -08:00
Srini Brahmaroutu
1ba8727736 Error should be 409 as the container is different state to remove 
Closes #9569

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6599aa3368f369e6b8632cc2c12f214b0450a5a6
Component: engine
 2014-12-19 19:00:28 +00:00
Josh Hawn
98bb6eba72 Make FROM scratch a special cased 'no-base' spec 
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.

This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!

This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.

Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.

Fixes #4242

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
 2014-12-18 14:03:38 -08:00
Alexander Morozov
4af408b6c1 Merge pull request #9635 from duglin/Issue3936 
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
 2014-12-18 06:58:50 -08:00
Doug Davis
a9b8d39261 Allow for relative paths on ADD/COPY 
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
 2014-12-18 05:13:04 -08:00
Michael Crosby
0935b51529 Merge pull request #9181 from icecrime/allocate_daemon_ports 
Allocate daemon listening ports
Upstream-commit: 21bba5d93a888e20d7fa8d7dd56efbdd1fd486c1
Component: engine
 2014-12-17 18:01:20 -08:00
Michael Crosby
6b6aa4bf22 Merge pull request #9643 from LK4D4/fix_vet_errors 
Fix vet errors
Upstream-commit: 17cacf3326edde6d177e12132f74fc0174bda1d2
Component: engine
 2014-12-16 12:04:15 -08:00
Michael Crosby
55ec358b5c Merge pull request #9610 from duglin/Issue9602 
Wrap strings that could look like ints in quotes
Upstream-commit: eea9f0e781f5a2cc438aad11315253b6fb42ed9e
Component: engine
 2014-12-16 12:02:26 -08:00
Arnaud Porterie
2187cf5beb Merge pull request #9122 from dqminh/debug-huge-expose 
Expose a large number of ports should not slow down builder
Upstream-commit: a76f7c6ec32431b6cbf286d9be86f7dde0b3ac0d
Component: engine
 2014-12-16 10:03:31 -08:00
Michael Crosby
2fa048715a Merge pull request #9631 from cpuguy83/9628_fix_volumes_hostconfig_on_start 
Fix volumes-from/bind-mounts passed in on start
Upstream-commit: 24d03b8ddee1d4b19d3ab34f66e4c54dda8b129e
Component: engine
 2014-12-15 15:51:57 -08:00
Michael Crosby
8ef74b2a51 Merge pull request #9638 from crosbymichael/build-volumes-retain-contents 
Add test to enforce volume build content
Upstream-commit: b84bfb43cdf94045a705989c7b1a4fb47f7ed84a
Component: engine
 2014-12-15 14:54:38 -08:00
Brian Goff
ecd4852381 Fix volumes-from/bind-mounts passed in on start 
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d44c9f91472eb3df4c38c669134df04b2ccf9953
Component: engine
 2014-12-15 16:51:15 -05:00
Alexander Morozov
d89ea8b641 Fix missing logDone for TestRunMutableNetworkFiles 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 03bdacbb4e4bf2fabf67bfdb8b5118bc7ed1edd2
Component: engine
 2014-12-15 13:44:22 -08:00
Doug Davis
ba3cc4bafb Wrap strings that could look like ints in quotes 
When we use the engine/env object we can run into a situation where
a string is passed in as the value but later on when we json serialize
the name/value pairs, because the string is made up of just numbers
it appears as an integer and not a string - meaning no quotes.  This
can cause parsing issues for clients.

I tried to find all spots where we call env.Set() and the type of the
name being set might end up having a value that could look like an int
(like author). In those cases I switched it to use env.SetJson() instead
because that will wrap it in quotes.

One interesting thing to note about the testcase that I modified is that
the escaped quotes should have been there all along and we were incorrectly
letting it thru. If you look at the metadata stored for that resource you
can see the quotes were escaped and we lost them during the serialization
steps because of the env.Set() stuff.  The use of env is probably not the
best way to do all of this.

Closes: #9602

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d942c59b696d16def85f6b65ae65c176f66a5562
Component: engine
 2014-12-15 05:10:49 -08:00
Michael Crosby
50ca4df488 Add test to enforce volume build content 
This tests ensures that the content from a dir within a build is carried
over even if VOLUME for that dir is specified in the Dockerfile.  This
test ensures this long standing functionality.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4856ec075422a7926b62762749a7fbcc869efa99
Component: engine
 2014-12-12 11:15:31 -08:00
Alexander Morozov
bebcb13002 Fix vet errors about formatting directives 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a7ae7fed7311551975d2bccb7417c328be3ea478
Component: engine
 2014-12-12 10:58:56 -08:00
Jessie Frazelle
98f4a5ba65 Merge pull request #9606 from LK4D4/fix_race_in_test 
Fix race in TestDaemonRestartWithVolumesRefs
Upstream-commit: c60e60a184cd8b07ea29f073585cb214408cdd7e
Component: engine
 2014-12-11 18:27:38 -08:00
Alexander Morozov
88fcffd088 Merge pull request #9624 from icecrime/silence_loginwithouttty_test 
Suppress output of TestLoginWithoutTTY
Upstream-commit: a07835d876b8c8f1991868cc6f1c9b3e2726eaec
Component: engine
 2014-12-11 18:26:58 -08:00
Arnaud Porterie
6a7248c5b7 Suppress output of TestLoginWithoutTTY 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 1cab340c10be71382a8cfde8402f475d503c94be
Component: engine
 2014-12-11 18:05:07 -08:00
Arnaud Porterie
67b329feba Add integration test for xz path issue 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: af2021955cb01507984cbd076edaf3caaf5b89b3
Component: engine
 2014-12-11 16:29:15 -05:00
Cristian Staretu
a013d9f804 Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e4ba82d50ee4642412a1e1bdf43a7b94fadd2428
Component: engine
 2014-12-11 16:26:52 -05:00
unclejack
273d3a2f40 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: a57eee2229c2f0c53c32372587fcc2a8327044ea
Component: engine
 2014-12-11 16:26:52 -05:00
unclejack
e6c672e7d3 integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 7496cbbccc278c084620661812ed5f6390c1d2f1
Component: engine
 2014-12-11 16:26:52 -05:00
Tibor Vass
dedefc8fcd Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: 0e71a48d4e89ce40c0ab94cc18599481d9e8a6b0
Component: engine
 2014-12-11 16:26:51 -05:00
Alexandr Morozov
41b0254a74 Fix race in TestDaemonRestartWithVolumesRefs 
Sometimes rm begins before process death, but Kill called already after
it, so we get error - no such process.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 0d70ad1c7205ba9e82dd1f244d26df93dc79de9e
Component: engine
 2014-12-10 20:55:51 -08:00
Arnaud Porterie
5231d38261 Fix permissions on ADD/COPY 
Fix a regression introduced in PR#9467 when a single file was added or
copied.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: cfc24769a26e825e4267cbfdd59af807e27508b9
Component: engine
 2014-12-10 11:09:03 -08:00
Arnaud Porterie
1d39a69298 Forbid client piping to tty enabled container 
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 67e3ddb75ff27b8de0022e330413b4308ec5b010
Component: engine
 2014-12-09 14:30:49 -08:00
Brian Goff
b4787aa54e Add test for exec tty stdin close 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 243a640d3e593ee11e31ac55a4df8c887c2b09c9
Component: engine
 2014-12-09 14:30:49 -08:00
Michael Crosby
bb5a33c82a Merge pull request #9356 from cc272309126/fix-exec-paused-container 
Fix the issue that when docker exec a paused container, it will always
Upstream-commit: bb24f99d741cd8d6a8b882afc929c15c633c39cb
Component: engine
 2014-12-09 11:01:44 -08:00