6dcb016943
Merge pull request #13868 from jfrazelle/update-gitignore-man
...
update gitignore for new manpages
Upstream-commit: ad9080a87c847121897f4d00dcde4541d392dd7c
Component: engine
2015-06-10 16:55:15 -07:00
64af46488a
update gitignore for new manpages
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: f88e620359eaf986a843714126a9a7df5e25e115
Component: engine
2015-06-10 16:11:15 -07:00
a487d04de7
Merge pull request #13863 from Microsoft/typoclientutils
...
Typo fix in api\client\utils.go
Upstream-commit: 466efebf0e9c41740316ec66c63ec6c7d64f9f57
Component: engine
2015-06-10 15:57:37 -07:00
c49e649bfd
Typo fix in api\client\utils.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Component: engine
2015-06-10 15:24:53 -07:00
475879cb0c
Merge pull request #13804 from moxiegirl/proposal-man-pages
...
PROPOSAL: Moving man pages out of docs
Upstream-commit: b6049b5c4963bb1b82ba381cdce69d1083bcf59e
Component: engine
2015-06-10 15:04:19 -07:00
5e66dbe684
Merge pull request #13854 from crosbymichael/revert-shared-root
...
Revert shared container rootfs
Upstream-commit: 9da65ed84f9fc285fa2d122c8341a897e5d0eb29
Component: engine
2015-06-10 14:12:14 -07:00
84b8fc6fe1
Moving man pages out of docs
...
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
2015-06-10 13:43:35 -07:00
6c4935d15a
Merge pull request #13832 from mapk0y/fix-error-msg
...
fix typo.
Upstream-commit: add64dc297a4549e1abe0e0c5176eeabd198fb47
Component: engine
2015-06-10 16:38:07 -04:00
b4e364cf05
Merge pull request #13272 from Microsoft/10662-daemonrefactorv2
...
Windows: Refactor daemon
Upstream-commit: 05644ccea9910179274ffc9e587a8787fe9cceae
Component: engine
2015-06-10 16:28:56 -04:00
0c9254be37
Merge pull request #13015 from mariussturm/master
...
Add logging driver for GELF via UDP
Upstream-commit: 17324c91e33d43472f94188b25ee4bed49630e39
Component: engine
2015-06-10 12:45:12 -07:00
a180cd8538
Windows: Refactor daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8fb0ca2c35c0df38a79c4eac62fd7d04e3688240
Component: engine
2015-06-10 12:42:43 -07:00
962cbe284b
Merge pull request #13853 from jfrazelle/fix-hack-make
...
ugh typo in hack scripts fix, introduced by 2b4facdf
Upstream-commit: 65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Component: engine
2015-06-10 11:53:47 -07:00
ebc23891b1
Revert shared container rootfs
...
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Component: engine
2015-06-10 11:29:27 -07:00
0c0594818f
add UDP GELF logging-driver
...
allows to send container logs to Graylog or Logstash.
Signed-off-by: Marius Sturm <marius@graylog.com >
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
2015-06-10 20:21:50 +02:00
9a7bae36c0
ugh typo in hack scripts fix, introduced by 2b4facdf
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: c5f49886fa1a7ce67ab020a19c4aea65225c3658
Component: engine
2015-06-10 11:00:59 -07:00
52e2bdb4c8
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
Upstream-commit: 12149e829369e879a1978420b6ec2100a4b4fadd
Component: engine
2015-06-10 10:34:13 -07:00
5a71e1d7b0
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
2015-06-10 12:37:40 -04:00
e359817c8d
Merge pull request #13844 from ponsfrilus/master
...
Typo psuedo - pseudo
Upstream-commit: 5821f13b8c8222ca75f5909236036222d175a25e
Component: engine
2015-06-10 11:41:44 -04:00
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
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
7b52c53f62
Typo psuedo - pseudo
...
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com >
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
2015-06-10 13:27:55 +02:00
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
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
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
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
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
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
8e654cb58d
fix typo.
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
Upstream-commit: 416e855e9b33464c81e86ff47ed19c93a781e604
Component: engine
2015-06-10 06:26:07 +09:00
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
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
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
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
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
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
