docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
16,120 Commits 12 Branches 296 Tags
e359817c8d634060a9318fcbfbee47ce286387bf
Commit Graph

16120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turnbull
e359817c8d Merge pull request #13844 from ponsfrilus/master 
Typo psuedo - pseudo
Upstream-commit: 5821f13b8c8222ca75f5909236036222d175a25e
Component: engine
 2015-06-10 11:41:44 -04:00
Doug Davis
85a6cd6efb Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
Upstream-commit: 46af724e81fe6890dc2709101e3c3f680db77631
Component: engine
 2015-06-10 08:32:57 -07:00
Tibor Vass
5ff5529252 Merge pull request #12813 from Microsoft/10662-nolinuxgraph 
Windows: Don't build Linux graph drivers
Upstream-commit: de90aef4115c5a183e4d9406842562933aa93cf4
Component: engine
 2015-06-10 10:01:50 -04:00
Nicolas Borboën
7b52c53f62 Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
 2015-06-10 13:27:55 +02:00
Arnaud Porterie
438dab23c9 Merge pull request #13699 from calavera/volume_backwards 
Allow to downgrade local volumes from > 1.7 to 1.6.
Upstream-commit: 55bdb51659b3982ae78cd24ed0823f6b8d0bb9b2
Component: engine
 2015-06-09 19:51:06 -07:00
David Calavera
416f8a0f5b Allow to downgrade local volumes from > 1.7 to 1.6. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bd9814f0db9c8a087e42b66eabb8413bf1b2ab66
Component: engine
 2015-06-09 18:04:59 -07:00
Michael Crosby
0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
 2015-06-09 17:24:30 -07:00
Arnaud Porterie
a53114bcd1 Merge pull request #13831 from LK4D4/update_libcontainer 
Update libcontainer to v2.1.1
Upstream-commit: c3b962d327d161171157b95d587946ebe5a5cfba
Component: engine
 2015-06-09 17:12:20 -07:00
Arnaud Porterie
f40bfd3ca4 Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302 
Do not set auth headers for registry v1 if 302
Upstream-commit: 13baeb3b70c5f145614cbbd582daa8a6fcbd2b79
Component: engine
 2015-06-09 15:34:53 -07:00
Jessie Frazelle
6f7de6a8db Merge pull request #12583 from Mic92/hack/explicit-bundles 
Hack/explicit bundles
Upstream-commit: ceee2595b6b38ec2f7fb01436884b41902acfecc
Component: engine
 2015-06-09 14:34:52 -07:00
Alexander Morozov
c35a83dbe6 Update libcontainer to v2.1.1 
It includes fix for mounting / as volume on SELinux.
docker/libcontainer#619

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 38acd31e8a99ef043f9a5cf84f968ebebc31614e
Component: engine
 2015-06-09 13:54:57 -07:00
Alexander Morozov
ede22a95a5 Merge pull request #13828 from calavera/plugin_fixes 
Fix volume plugin serialization.
Upstream-commit: 5e86b818ed41c4dfd90624b43b5e4da29e39d653
Component: engine
 2015-06-09 13:30:55 -07:00
David Calavera
a2796266b3 Merge pull request #13805 from aboch/czo 
Add integ test for unpublished ports in ps o/p
Upstream-commit: 18ddc2728d53d4ed014e615115947006fdfe2a20
Component: engine
 2015-06-09 11:30:06 -07:00
Alexander Morozov
3c1a9cc928 Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container 
daemon: cleanup getting container logic
Upstream-commit: 06aef2b5c24d694a4876bd43c57868dad59e2e11
Component: engine
 2015-06-09 10:42:24 -07:00
David Calavera
1552ac1282 Fix volume plugin serialization. 
Unmarshal errors into strings.
Fix `omit` typos.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 30448166deca62e1f3a43f8e86cd02244b499344
Component: engine
 2015-06-09 10:39:46 -07:00
Alessandro Boch
6dd95e3682 Add integ test for unpublished ports in ps o/p 
- This is a test to assert the fix #13734

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 7b9ae696d86066f6245e2c17e7afd5ce8e868fe5
Component: engine
 2015-06-09 09:40:19 -07:00
Sebastiaan van Stijn
89751ffa0c Merge pull request #12031 from jlhawn/build_cache_ignore_mtime 
Make build cache ignore mtime
Upstream-commit: 90259fed2ecc0b21a41e997bd4812aa845b79dfb
Component: engine
 2015-06-09 18:26:07 +02:00
James Turnbull
7ca30cc398 Merge pull request #13814 from duglin/DocTweak 
Fix COPY/ADD quoted/json form
Upstream-commit: 3b01dac44d0095c31354c0f58e5ff26bf6ef12f2
Component: engine
 2015-06-09 04:56:35 -04:00
Ma Shimiao
58ce17869e daemon: cleanup getting container logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 73bc885b23fb06b6d9d6cb554fde93fe0e6bcb98
Component: engine
 2015-06-09 14:47:07 +08:00
Jörg Thalheim
aeb5ca3cb3 hack: explicit bundles for integration-cli prequisites 
no longer load hide critical code such as in .integration-daemon-{start,stop},
if this step failed, it will had logged the corresponding module before:

---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)

which is nicer to debug.

This will make it also easier to execute a single tests in an interactive shell.

$ make shell
docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
docker> docker ps
CONTAINER ID        IMAGE               COMMAND             CREATED STATUS              PORTS               NAMES
docker> go test github.com/docker/docker/integration-cli

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: 2b4facdf2ed6b1074a2a8abc031bf0827b6d5f33
Component: engine
 2015-06-09 07:22:26 +02:00
Alexander Morozov
74e1aa713e Merge pull request #13816 from xiekeyang/remove 
Registry: remove unwanted return variable name
Upstream-commit: 7f6aa3b783620065281493a88ac1cc2a1833b93d
Component: engine
 2015-06-08 20:38:30 -07:00
xiekeyang
366768923f Registry: remove unwanted return variable name 
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
Upstream-commit: a31be2512136444ce473235a35d6fd47634e3f13
Component: engine
 2015-06-09 10:58:33 +08:00
Jessie Frazelle
d46ebeb4ca Merge pull request #13714 from flavio/add-suse-support-to-docker-installer 
Added openSUSE and SUSE Linux Enterprise support to install.sh
Upstream-commit: 5e0e71bbe0cdb2dd23abee130b6ca7887c02731a
Component: engine
 2015-06-08 17:20:33 -07:00
Tibor Vass
f87511cc9a Do not set auth headers if 302 
This patch ensures no auth headers are set for v1 registries if there
was a 302 redirect.

This also ensures v2 does not use authTransport.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 123a0582b2f9522bdfb95cceabf8dd21af758300
Component: engine
 2015-06-08 19:59:39 -04:00
Doug Davis
bff41b9dc6 Fix COPY/ADD quoted/json form 
Minor tweak to the quoted/json form and made man page look like the Dockerfile
docs.  W/o the `,` people may think there should be a space delimited list.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f4a3e8bef0070af6ad883fd06e504a8b1d4c93ba
Component: engine
 2015-06-08 16:40:20 -07:00
Jessie Frazelle
67f2667620 Merge pull request #13022 from Microsoft/10662-addrsrc 
Windows: Add resources for manifest and icon
Upstream-commit: a2ab067b3c56f6b296150531c94a05b357fc0d70
Component: engine
 2015-06-08 15:16:10 -07:00
Jessie Frazelle
2345f52566 Merge pull request #12992 from aidanhs/aphs-easy-debug-build 
Allow passing DOCKER_DEBUG= to `make`
Upstream-commit: 75f63499a05ecd6511b468b666973ed9d38037ae
Component: engine
 2015-06-08 15:15:49 -07:00
John Howard
bd6a18d14c Windows: Don't build Linux graph drivers 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9a9dc5ba96d2661f5dc2037db44d0984d2129946
Component: engine
 2015-06-08 15:09:33 -07:00
David Calavera
10a4b5c5a3 Merge pull request #13808 from Microsoft/10662-volumefixcompile 
Windows: Fix PR13278 compile break
Upstream-commit: 4ad05ed9859614203708eec3d3a1ecf0cc81e17a
Component: engine
 2015-06-08 15:02:47 -07:00
Tianon Gravi
ecd78c774c Merge pull request #13546 from hqhq/hq_checkconfig_rescount 
Don't check RESOURCE_COUNTERS in new kernel
Upstream-commit: 969cb545ae5022dc38113f741f2ba3f873cfb967
Component: engine
 2015-06-08 14:43:17 -07:00
Tianon Gravi
d566107a2f Merge pull request #13790 from jfrazelle/update-authors-mailmap 
update authors and mailmap
Upstream-commit: c69d3b749dfa19ed0e899c1f7ac5eff8212a9ccf
Component: engine
 2015-06-08 14:24:32 -07:00
Josh Hawn
4b582bde62 [docs] Update builder docs on last-modified times 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: cd7e2a6b2b529cb4180926352a3fe9e82040d073
Component: engine
 2015-06-08 13:55:02 -07:00
Josh Hawn
e778cd68a0 [builder] Make build cache ignore mtime 
Build cache uses pgk/tarsum to get a digest of content which is
ADD'd or COPY'd during a build. The builder has always used v0 of
the tarsum algorithm which includes mtimes however since the whole
file is hashed anyway, the mtime doesn't really provide any extra
information about whether the file has changed and many version
control tools like Git strip mtime from files when they are cloned.

This patch updates the build subsystem to use v1 of Tarsum which
explicitly ignores mtime when calculating a digest. Now ADD and
COPY will result in a cache hit if only the mtime and not the file
contents have changed.

NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
function. It is a best-effort approach to determining if two sets of
filesystem content are different.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 0e10507a1c5985e6fda0ff48e9313ba7a4de761b
Component: engine
 2015-06-08 13:54:47 -07:00
John Howard
93011f5563 Windows: Fix PR13278 compile break 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 71eadd4176a968399671e5cb4c8de52c40992b01
Component: engine
 2015-06-08 13:47:09 -07:00
Michael Crosby
fda82af70c Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file 
Fix docs URL in systemd service file.
Upstream-commit: b099eb796a54276ea6585d9647b274d296a83aed
Component: engine
 2015-06-08 09:36:36 -07:00
Sebastiaan van Stijn
491f028ae1 Merge pull request #13713 from draghuram/manport 
Fix examples in "docker port" man page.
Upstream-commit: 875eafb00b07411e361993d256adf8f459d1bafa
Component: engine
 2015-06-08 17:08:37 +02:00
Raghuram Devarakonda
87d1d89392 Fix examples in "docker port" man page. 
Closes #13667.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: bf6492e689e2cb375fe6b39327dbe0655452640a
Component: engine
 2015-06-08 10:40:24 -04:00
James Turnbull
f3788914db Merge pull request #13797 from eolamey/13796-tiny-systemd-docs-improvements 
Tiny improvements to systemd docs.
Upstream-commit: c622ca6d4b6575d6711a2c8340f5119730a1b8f9
Component: engine
 2015-06-08 08:57:13 -04:00
Eric-Olivier Lamey
32e7cf7b8b Tiny improvements to systemd docs. 
Show how to use `systemctl show` and recommend against modifying
system unit files in `/usr` and `/lib`.

Fixes #13796.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 68bfd9e3aea088b644c058be77b5fa24bbdea7f9
Component: engine
 2015-06-08 12:05:34 +00:00
Eric-Olivier Lamey
2c15e96c15 Fix docs URL in systemd service file. 
Fixes #13799.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: dbf5e36fd6257ed237f76a65ccbae4124a4f0bdf
Component: engine
 2015-06-08 10:21:43 +00:00
Alexander Morozov
a85728f101 Merge pull request #13582 from coolljt0725/remove_useless_code 
Cleanup: remove some useless code
Upstream-commit: a63c7c7be678880fb5c11f3c9cb7b3029d132b7f
Component: engine
 2015-06-07 23:01:39 -07:00
Jana Radhakrishnan
2ee4e129d1 libnetwork: Add garbage collection trigger 
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Component: engine
 2015-06-07 21:33:51 -07:00
Lei Jitang
4d366ead20 Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 67552fb22d254ba5e515aa899b1da3173f474a14
Component: engine
 2015-06-08 09:06:58 +08:00
Doug Davis
f5234e7cf7 Merge pull request #13795 from michael-k/daemonFolder 
[integration-cli] Made doc consistent with code
Upstream-commit: 5d22afc54e21677dc3bf5e0f0283aff9d8892701
Component: engine
 2015-06-07 16:57:54 -04:00
Michael Käufl
42682fb818 Made doc consistent with code 
The name of the folder was shortened in a1ea562

Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: 54ac3d9c76df3bbbb54b85b58a503cc1d6155f01
Component: engine
 2015-06-07 22:32:29 +02:00
Doug Davis
8eb50c9051 Merge pull request #13787 from runcom/check-nil-Config 
Avoid nil pointer dereference while creating a container with an empty Config
Upstream-commit: 07b22fcf50f0156a5a15d5392a7dcb340b493f34
Component: engine
 2015-06-07 12:28:41 -04:00
James Turnbull
6726a8ab9a Merge pull request #13791 from eolamey/minor-docs-fixes 
Fix a typo and a minor formatting issue in the docs.
Upstream-commit: 3c37a307bcd67bbb3f1b0333dd30eb45b1650492
Component: engine
 2015-06-07 09:25:15 -04:00
Eric-Olivier Lamey
b9079beed3 Fix a typo and a minor formatting issue in the docs. 
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 173d0918a8ddffe1ba8a057527feccb6bee7f30b
Component: engine
 2015-06-07 12:49:03 +00:00
Jessica Frazelle
319b064c6f update authors and mailmap 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: ae68dfe31b641a1dad7e3072ed2413dc32cfcd32
Component: engine
 2015-06-06 21:42:14 -07:00
Alexander Morozov
34bcda9fbc Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please 
Restore --default-gateway{,-v6} daemon options.
Upstream-commit: 3d10540bc330ec0a99229e2a943ae04a0f8b38c9
Component: engine
 2015-06-06 16:02:59 -07:00