466efebf0e
Merge pull request #13863 from Microsoft/typoclientutils
...
Typo fix in api\client\utils.go
2015-06-10 15:57:37 -07:00
84aec1e8e6
Typo fix in api\client\utils.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-10 15:24:53 -07:00
b6049b5c49
Merge pull request #13804 from moxiegirl/proposal-man-pages
...
PROPOSAL: Moving man pages out of docs
2015-06-10 15:04:19 -07:00
9da65ed84f
Merge pull request #13854 from crosbymichael/revert-shared-root
...
Revert shared container rootfs
2015-06-10 14:12:14 -07:00
eacae64bd8
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>
2015-06-10 13:43:35 -07:00
add64dc297
Merge pull request #13832 from mapk0y/fix-error-msg
...
fix typo.
2015-06-10 16:38:07 -04:00
05644ccea9
Merge pull request #13272 from Microsoft/10662-daemonrefactorv2
...
Windows: Refactor daemon
2015-06-10 16:28:56 -04:00
17324c91e3
Merge pull request #13015 from mariussturm/master
...
Add logging driver for GELF via UDP
2015-06-10 12:45:12 -07:00
8fb0ca2c35
Windows: Refactor daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-10 12:42:43 -07:00
65d0670d65
Merge pull request #13853 from jfrazelle/fix-hack-make
...
ugh typo in hack scripts fix, introduced by 2b4facdf
2015-06-10 11:53:47 -07:00
c9d71317be
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>
2015-06-10 11:29:27 -07:00
96d06e106f
add UDP GELF logging-driver
...
allows to send container logs to Graylog or Logstash.
Signed-off-by: Marius Sturm <marius@graylog.com>
2015-06-10 20:21:50 +02:00
c5f49886fa
ugh typo in hack scripts fix, introduced by 2b4facdf
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-10 11:00:59 -07:00
12149e8293
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
2015-06-10 10:34:13 -07:00
74c12aa429
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-10 12:37:40 -04:00
5821f13b8c
Merge pull request #13844 from ponsfrilus/master
...
Typo psuedo - pseudo
2015-06-10 11:41:44 -04:00
46af724e81
Merge pull request #12371 from rhatdan/kill
...
docker kill should return error if container is not running.
2015-06-10 08:32:57 -07:00
de90aef411
Merge pull request #12813 from Microsoft/10662-nolinuxgraph
...
Windows: Don't build Linux graph drivers
2015-06-10 10:01:50 -04:00
e12839fa5a
Typo psuedo - pseudo
...
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
2015-06-10 13:27:55 +02:00
55bdb51659
Merge pull request #13699 from calavera/volume_backwards
...
Allow to downgrade local volumes from > 1.7 to 1.6.
2015-06-09 19:51:06 -07:00
bd9814f0db
Allow to downgrade local volumes from > 1.7 to 1.6.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-09 18:04:59 -07:00
4750e1f77e
Merge pull request #13784 from mrjana/cnm_integ
...
libnetwork: Add garbage collection trigger
2015-06-09 17:24:30 -07:00
c3b962d327
Merge pull request #13831 from LK4D4/update_libcontainer
...
Update libcontainer to v2.1.1
2015-06-09 17:12:20 -07:00
13baeb3b70
Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302
...
Do not set auth headers for registry v1 if 302
2015-06-09 15:34:53 -07:00
ceee2595b6
Merge pull request #12583 from Mic92/hack/explicit-bundles
...
Hack/explicit bundles
2015-06-09 14:34:52 -07:00
416e855e9b
fix typo.
...
Signed-off-by: mapk0y <mapk0y@gmail.com>
2015-06-10 06:26:07 +09:00
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
5e86b818ed
Merge pull request #13828 from calavera/plugin_fixes
...
Fix volume plugin serialization.
2015-06-09 13:30:55 -07:00
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
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
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
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
90259fed2e
Merge pull request #12031 from jlhawn/build_cache_ignore_mtime
...
Make build cache ignore mtime
2015-06-09 18:26:07 +02:00
3b01dac44d
Merge pull request #13814 from duglin/DocTweak
...
Fix COPY/ADD quoted/json form
2015-06-09 04:56:35 -04:00
73bc885b23
daemon: cleanup getting container logic
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-06-09 14:47:07 +08:00
2b4facdf2e
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>
2015-06-09 07:22:26 +02:00
7f6aa3b783
Merge pull request #13816 from xiekeyang/remove
...
Registry: remove unwanted return variable name
2015-06-08 20:38:30 -07:00
a31be25121
Registry: remove unwanted return variable name
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2015-06-09 10:58:33 +08:00
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
123a0582b2
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>
2015-06-08 19:59:39 -04:00
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
a2ab067b3c
Merge pull request #13022 from Microsoft/10662-addrsrc
...
Windows: Add resources for manifest and icon
2015-06-08 15:16:10 -07:00
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
9a9dc5ba96
Windows: Don't build Linux graph drivers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-08 15:09:33 -07:00
4ad05ed985
Merge pull request #13808 from Microsoft/10662-volumefixcompile
...
Windows: Fix PR13278 compile break
2015-06-08 15:02:47 -07:00
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
c69d3b749d
Merge pull request #13790 from jfrazelle/update-authors-mailmap
...
update authors and mailmap
2015-06-08 14:24:32 -07:00
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
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
71eadd4176
Windows: Fix PR13278 compile break
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-08 13:47:09 -07:00
Doug Davis
John Howard
David Calavera
Arnaud Porterie
Mary Anthony
Tibor Vass
Brian Goff
Jessie Frazelle
Michael Crosby
Marius Sturm
Jessica Frazelle
James Turnbull
Nicolas Borboën
mapk0y
Alexander Morozov
Alexander Morozov
Alessandro Boch
Sebastiaan van Stijn
Ma Shimiao
Jörg Thalheim
xiekeyang
Tibor Vass
Doug Davis
Tianon Gravi
Josh Hawn