Commit Graph

16103 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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