docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
16,093 Commits 12 Branches 296 Tags
5fcdacd7a5976804b251fe1b51f411110fbe08bd
Commit Graph

14947 Commits

Author SHA1 Message Date
Lei Jitang
5fcdacd7a5 Correct the error message of pause and unpause non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 20927ffbe7cf1f6bdc2f7eb17db2a443abacf4c0
Component: engine
 2015-05-31 03:32:29 +08: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
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
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
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
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
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
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
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
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
Antonio Murdaca
6aab6b5654 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
 2015-06-06 20:07:32 +02:00
James Turnbull
ddadb07458 Merge pull request #13764 from bcexelbi/bexelbie_man_typo 
Fixing typo in Dockerfile manpage
Upstream-commit: 3c132ff62d49247abed25a5686611bcac6801b23
Component: engine
 2015-06-06 08:50:27 -04:00
moxiegirl
3f884b5df5 Merge pull request #13776 from duglin/MinorVolDocEdit 
Minor doc edit to add clarity around the --volume path format
Upstream-commit: ffd74e74b19cf402f7d9a98fe77790c4a79655da
Component: engine
 2015-06-05 18:41:37 -07:00
Jessie Frazelle
43bd2efd7c Merge pull request #13778 from LK4D4/rename_file 
Rename test file to have _test postfix
Upstream-commit: f20863929b3ca7c6a2735200404ec8af8fd6ebbf
Component: engine
 2015-06-05 15:43:55 -07:00
Doug Davis
21f31995a1 Minor doc edit to add clarity around the --volume path format 
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3fcf53db920de9d9111a86bd0eda90a059885754
Component: engine
 2015-06-05 15:11:42 -07:00
Alexander Morozov
ffc2b1eb23 Rename test file to have _test postfix 
Without this go test was unable to find line number of error in that
file.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ff9877ccc4db4d0891583ebac6558a235b028942
Component: engine
 2015-06-05 13:49:58 -07:00
moxiegirl
68316f4f57 Merge pull request #12573 from clnperez/doc-article-baseimage 
Update doc with usage of the scratch image
Upstream-commit: 7c64ed5c8c49d786d626f6a4704d868ae4662374
Component: engine
 2015-06-05 13:36:33 -07:00
Jessie Frazelle
f43a943abe Merge pull request #13772 from icecrime/13770_image_labels_to_containers 
Container don't inherit from image labels
Upstream-commit: af29aff53c95ed2a478693b566cc93c19362cce8
Component: engine
 2015-06-05 13:25:34 -07:00
Christy Perez
f298ea7477 Update doc with usage of the scratch image 
The scratch image used to be a regular image, but as of
commit 8936789919c5c8004f346f44a3452d1521818b60 it is a
special case, and cannot be used with 'docker pull.'

Update this doc to reflect the new behavior and clear up
confusion surrounding this image.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 77bd53adfe6877acd1ff8f07cf148f1dbe0b425d
Component: engine
 2015-06-05 14:47:03 -05:00
Arnaud Porterie
4dfff4ae36 Container don't inherit from image labels 
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.

It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.

Fixes #13770.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 79621c7728ab83292ffd94d005f10ccebfba055b
Component: engine
 2015-06-05 11:11:22 -07:00
Jessie Frazelle
52a74c1bf3 Merge pull request #13767 from duglin/TweakInNetOpts 
Remove duplicate call to net.ParseIP
Upstream-commit: 5c051e2e263955788809819c37a4a3b9142247ed
Component: engine
 2015-06-05 10:46:31 -07:00
Alexander Morozov
bc7977060e Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh 
fix lxc build
Upstream-commit: 078b8e54e4429f838ff26ddace34854167fe0b42
Component: engine
 2015-06-05 10:27:58 -07:00
Arnaud Porterie
1ddffd6be6 Merge pull request #13636 from tiborvass/refactor-tls 
Refactor TLS code with a new `tlsconfig` package
Upstream-commit: efe5c647684d8050ed174e0984d07de0f8489bbd
Component: engine
 2015-06-05 10:16:24 -07:00
Sebastiaan van Stijn
9ab702314a Merge pull request #13748 from icecrime/experimental_docs 
Minor changes to experimental docs
Upstream-commit: 69c2f5649a135835d5ea8e519a4f1b37f9d7127f
Component: engine
 2015-06-05 19:11:51 +02:00
Jessica Frazelle
9eb2d545d0 fix lxc build 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 0adfb908a682e679b54f511fe89e668d6e676dda
Component: engine
 2015-06-05 09:50:30 -07:00
Doug Davis
325dbaa39c Remove duplicate call to net.ParseIP 
and a little cleanup

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b180de55caa382fd6ced4488d68392edd1d34da0
Component: engine
 2015-06-05 09:44:10 -07:00
Tibor Vass
01de0478de Refactor TLS code with a new tlsconfig package 
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.

The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.

On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Component: engine
 2015-06-05 12:38:38 -04:00
Phil Estes
130b3e7cb1 Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs 
Fix goroutine leak on logs -f with no output
Upstream-commit: edb7e84ddbe8df4767e7249c76551ce69d68e8f4
Component: engine
 2015-06-05 11:43:47 -04:00
Brian (bex) Exelbierd
8263a87e8d Fixing typo in Dockerfile manpage 
Signed-off-by: Brian Exelbierd <bex@pobox.com>
Upstream-commit: d32e01be1ae7e72b4d9e4a6aeb462c60a8dc299c
Component: engine
 2015-06-05 16:33:11 +02:00
Sven Dowideit
f4b07b21ea Bring over DHE docs updates for publishing 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9ed2cb300b255842a3d318a112784b806c1bf8e7
Component: engine
 2015-06-05 21:06:59 +10:00
Eric-Olivier Lamey
9644714f56 Restore --default-gateway{,-v6} daemon options. 
This was added before the libnetwork merge, and then lost. Fixes #13755.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Component: engine
 2015-06-05 06:21:22 +00:00
Jessie Frazelle
87aa2e6ea1 Merge pull request #13752 from tianon/fix-release-debs 
Fix release script to release _both_ .deb files
Upstream-commit: cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Component: engine
 2015-06-04 16:37:59 -07:00
David Calavera
877de25418 Merge pull request #13640 from Microsoft/10662-implementmeminfo 
Windows: Implement ReadMemInfo()
Upstream-commit: e33aeac70892b2088442fc146fb16ab59b4eb58c
Component: engine
 2015-06-04 16:09:24 -07:00
Tianon Gravi
605f84f177 Fix release script to release _both_ .deb files 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 4572329d4b1d7b4f9cb638961a299f79443506bb
Component: engine
 2015-06-04 16:08:12 -07:00
Antonio Murdaca
649fae7e21 Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output 
registry: debugTransport should print with testing.T.Log
Upstream-commit: a06e0bb8b49819402180331d325d919f865a5fbd
Component: engine
 2015-06-05 00:42:22 +02:00
Brian Goff
02d7f238fb Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info 
Cleanup Daemon.verifyVolumesInfo() a bit
Upstream-commit: a2602c617d0afcf829983c46abd9cc95f2003078
Component: engine
 2015-06-04 15:39:31 -07:00
Brian Goff
3ebd8c1a62 Fix goroutine leak on logs -f with no output 
Also noticed potential hang when only stdout or stderr are used with
follow=1

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
 2015-06-04 13:56:40 -07:00
Arnaud Porterie
de132e9aef Merge pull request #13734 from aboch/master 
Fix for #13720. Unpublished ports missing in docker ps
Upstream-commit: b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Component: engine
 2015-06-04 12:05:47 -07:00