centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,102 Commits 57 Branches 28 Tags
38acd31e8a99ef043f9a5cf84f968ebebc31614e
Commit Graph

16102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov
38acd31e8a 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>
 2015-06-09 13:54:57 -07:00
Alexander Morozov
5e86b818ed Merge pull request #13828 from calavera/plugin_fixes 
Fix volume plugin serialization.
 2015-06-09 13:30:55 -07:00
David Calavera
18ddc2728d Merge pull request #13805 from aboch/czo 
Add integ test for unpublished ports in ps o/p
 2015-06-09 11:30:06 -07:00
Alexander Morozov
06aef2b5c2 Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container 
daemon: cleanup getting container logic
 2015-06-09 10:42:24 -07:00
David Calavera
30448166de Fix volume plugin serialization. 
Unmarshal errors into strings.
Fix `omit` typos.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-09 10:39:46 -07:00
Alessandro Boch
7b9ae696d8 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>
 2015-06-09 09:40:19 -07:00
Sebastiaan van Stijn
90259fed2e Merge pull request #12031 from jlhawn/build_cache_ignore_mtime 
Make build cache ignore mtime
 2015-06-09 18:26:07 +02:00
James Turnbull
3b01dac44d Merge pull request #13814 from duglin/DocTweak 
Fix COPY/ADD quoted/json form
 2015-06-09 04:56:35 -04:00
Ma Shimiao
73bc885b23 daemon: cleanup getting container logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-06-09 14:47:07 +08:00
Alexander Morozov
7f6aa3b783 Merge pull request #13816 from xiekeyang/remove 
Registry: remove unwanted return variable name
 2015-06-08 20:38:30 -07:00
xiekeyang
a31be25121 Registry: remove unwanted return variable name 
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
 2015-06-09 10:58:33 +08:00
Jessie Frazelle
5e0e71bbe0 Merge pull request #13714 from flavio/add-suse-support-to-docker-installer 
Added openSUSE and SUSE Linux Enterprise support to install.sh
 2015-06-08 17:20:33 -07:00
Doug Davis
f4a3e8bef0 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>
 2015-06-08 16:40:20 -07:00
Jessie Frazelle
a2ab067b3c Merge pull request #13022 from Microsoft/10662-addrsrc 
Windows: Add resources for manifest and icon
 2015-06-08 15:16:10 -07:00
Jessie Frazelle
75f63499a0 Merge pull request #12992 from aidanhs/aphs-easy-debug-build 
Allow passing DOCKER_DEBUG= to `make`
 2015-06-08 15:15:49 -07:00
David Calavera
4ad05ed985 Merge pull request #13808 from Microsoft/10662-volumefixcompile 
Windows: Fix PR13278 compile break
 2015-06-08 15:02:47 -07:00
Tianon Gravi
969cb545ae Merge pull request #13546 from hqhq/hq_checkconfig_rescount 
Don't check RESOURCE_COUNTERS in new kernel
 2015-06-08 14:43:17 -07:00
Tianon Gravi
c69d3b749d Merge pull request #13790 from jfrazelle/update-authors-mailmap 
update authors and mailmap
 2015-06-08 14:24:32 -07:00
Josh Hawn
cd7e2a6b2b [docs] Update builder docs on last-modified times 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-08 13:55:02 -07:00
Josh Hawn
0e10507a1c [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)
 2015-06-08 13:54:47 -07:00
John Howard
71eadd4176 Windows: Fix PR13278 compile break 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-08 13:47:09 -07:00
Michael Crosby
b099eb796a Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file 
Fix docs URL in systemd service file.
 2015-06-08 09:36:36 -07:00
Sebastiaan van Stijn
875eafb00b Merge pull request #13713 from draghuram/manport 
Fix examples in "docker port" man page.
 2015-06-08 17:08:37 +02:00
Raghuram Devarakonda
bf6492e689 Fix examples in "docker port" man page. 
Closes #13667.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-06-08 10:40:24 -04:00
James Turnbull
c622ca6d4b Merge pull request #13797 from eolamey/13796-tiny-systemd-docs-improvements 
Tiny improvements to systemd docs.
 2015-06-08 08:57:13 -04:00
Eric-Olivier Lamey
68bfd9e3ae 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>
 2015-06-08 12:05:34 +00:00
Eric-Olivier Lamey
dbf5e36fd6 Fix docs URL in systemd service file. 
Fixes #13799.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-08 10:21:43 +00:00
Alexander Morozov
a63c7c7be6 Merge pull request #13582 from coolljt0725/remove_useless_code 
Cleanup: remove some useless code
 2015-06-07 23:01:39 -07:00
Lei Jitang
67552fb22d Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-08 09:06:58 +08:00
Doug Davis
5d22afc54e Merge pull request #13795 from michael-k/daemonFolder 
[integration-cli] Made doc consistent with code
 2015-06-07 16:57:54 -04:00
Michael Käufl
54ac3d9c76 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>
 2015-06-07 22:32:29 +02:00
Doug Davis
07b22fcf50 Merge pull request #13787 from runcom/check-nil-Config 
Avoid nil pointer dereference while creating a container with an empty Config
 2015-06-07 12:28:41 -04:00
James Turnbull
3c37a307bc Merge pull request #13791 from eolamey/minor-docs-fixes 
Fix a typo and a minor formatting issue in the docs.
 2015-06-07 09:25:15 -04:00
Eric-Olivier Lamey
173d0918a8 Fix a typo and a minor formatting issue in the docs. 
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-07 12:49:03 +00:00
Jessica Frazelle
ae68dfe31b update authors and mailmap 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-06 21:42:14 -07:00
Alexander Morozov
3d10540bc3 Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please 
Restore --default-gateway{,-v6} daemon options.
 2015-06-06 16:02:59 -07:00
Antonio Murdaca
4ce817796e Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-06 20:07:32 +02:00
James Turnbull
3c132ff62d Merge pull request #13764 from bcexelbi/bexelbie_man_typo 
Fixing typo in Dockerfile manpage
 2015-06-06 08:50:27 -04:00
moxiegirl
ffd74e74b1 Merge pull request #13776 from duglin/MinorVolDocEdit 
Minor doc edit to add clarity around the --volume path format
 2015-06-05 18:41:37 -07:00
Jessie Frazelle
f20863929b Merge pull request #13778 from LK4D4/rename_file 
Rename test file to have _test postfix
 2015-06-05 15:43:55 -07:00
Doug Davis
3fcf53db92 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>
 2015-06-05 15:11:42 -07:00
Alexander Morozov
ff9877ccc4 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>
 2015-06-05 13:49:58 -07:00
moxiegirl
7c64ed5c8c Merge pull request #12573 from clnperez/doc-article-baseimage 
Update doc with usage of the scratch image
 2015-06-05 13:36:33 -07:00
Jessie Frazelle
af29aff53c Merge pull request #13772 from icecrime/13770_image_labels_to_containers 
Container don't inherit from image labels
 2015-06-05 13:25:34 -07:00
Christy Perez
77bd53adfe Update doc with usage of the scratch image 
The scratch image used to be a regular image, but as of
commit 8936789919 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>
 2015-06-05 14:47:03 -05:00
Arnaud Porterie
79621c7728 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>
 2015-06-05 11:11:22 -07:00
Jessie Frazelle
5c051e2e26 Merge pull request #13767 from duglin/TweakInNetOpts 
Remove duplicate call to net.ParseIP
 2015-06-05 10:46:31 -07:00
Alexander Morozov
078b8e54e4 Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh 
fix lxc build
 2015-06-05 10:27:58 -07:00
Arnaud Porterie
efe5c64768 Merge pull request #13636 from tiborvass/refactor-tls 
Refactor TLS code with a new `tlsconfig` package
 2015-06-05 10:16:24 -07:00
Sebastiaan van Stijn
69c2f5649a Merge pull request #13748 from icecrime/experimental_docs 
Minor changes to experimental docs
 2015-06-05 19:11:51 +02:00