Nathan LeClaire
c577d8fad6
Merge pull request #486 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-05 09:09:10 -07:00
Vincent Demeester
bb125650c9
Merge pull request #21015 from cpuguy83/add_opaque_mount_id
...
When calling volume driver Mount, send opaque ID
2016-05-05 18:00:15 +02:00
Brian Goff
0d3d8d6416
Merge pull request #22505 from runcom/authz-load-import
...
integration-cli: test load/import with authz plugins
2016-05-05 11:37:20 -04:00
Vincent Demeester
c37ca913ff
Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command
...
Documentation: docker volumes: remove trailing comma from top command
2016-05-05 17:26:06 +02:00
objectified
c7e738d641
remove trailing comma from top command
...
Signed-off-by: objectified <objectified@gmail.com >
2016-05-05 13:18:23 +02:00
Vincent Demeester
af916d316a
Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
...
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
Vincent Demeester
6dd4c3569c
Merge pull request #19651 from zhuguihua/add_disk_quota_for_btrfs
...
Add disk quota support for btrfs
2016-05-05 13:15:45 +02:00
Liron Levin
26cbc805e1
Enable notary client static compile
...
Update pkcs11 package (missing -ldl in LDFLAGS)
Signed-off-by: Liron Levin <liron@twistlock.com >
2016-05-05 11:12:50 +03:00
Vincent Demeester
4de672690c
Merge pull request #22270 from runcom/too-many-login
...
distribution: errors: do not retry if too many login attempts
2016-05-05 09:44:09 +02:00
Vincent Demeester
378a8e7175
Merge pull request #22508 from Microsoft/jjh/arg
...
Windows: Support ARG in builder
2016-05-05 09:09:55 +02:00
Zhu Guihua
401c8d1767
Add disk quota support for btrfs
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com >
2016-05-05 14:35:13 +08:00
Dongluo Chen
5925814d84
Merge pull request #2180 from ogryzek/typo-edits
...
Edit typos in 'Try Swarm at scale'
2016-05-04 22:33:31 -07:00
Riyaz Faizullabhoy
29e65f6d9a
Add client key and cert to rethink client tls config
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-05-04 20:49:31 -07:00
Kenfe-Mickael Laventure
6118952e44
Add dockerd to the list of files included in generated rpms
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-05-04 20:45:22 -07:00
Eric Bloch
96c904a51e
Add tcsh support to --shell
...
Fixes #3404
Signed-off-by: Eric Bloch <eric.bloch@gmail.com >
2016-05-04 20:29:07 -07:00
Charles Smith
7ab56957a6
Merge pull request #1978 from troyfontaine/discovery_node_docs
...
Added node discovery warning
2016-05-04 19:12:37 -07:00
Brian Goff
85988b33d2
Use pivot_root instead of chroot for chrootarchive
...
This fixes one issue with Docker running under a grsec kernel, which
denies chmod and mknod under chroot.
Note, if pivot_root fails it will still fallback to chroot.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-05-04 19:55:34 -04:00
Richard Scothern
2a4deee441
Remove the unimplemented monolithic upload section from the API documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-05-04 15:58:08 -07:00
Joao Fernandes
080d64bf75
Improves docs for upgrading
...
* fixes #1880
2016-05-04 15:03:26 -07:00
Sebastiaan van Stijn
6870d9789a
Merge pull request #22166 from moxiegirl/device-mapper-update
...
Device mapper update
2016-05-05 00:02:02 +02:00
Sebastiaan van Stijn
6dcadaa465
Merge pull request #22512 from tkopczynski/typos-supervisor
...
Docs: fixing typos in admin/supervisor
2016-05-04 23:57:55 +02:00
Sebastiaan van Stijn
1fe9715f30
Merge pull request #22423 from mlaventure/rm-containers-if-rm-in-progress-on-restart
...
Reset RemovalInProgress flag on daemon restart
2016-05-04 23:57:16 +02:00
Tibor Vass
0c68402887
Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
...
Update build-deb to make correct use of DOCKER_BUILD_PKGS
2016-05-04 17:55:20 -04:00
John Howard
6b5c83bf18
Windows: Support ARG in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-05-04 14:32:23 -07:00
Olivier Gambier
4ecea4b311
Merge pull request #1663 from moxiegirl/fix-flags
...
Fixing nginx flag issue identified by customer
2016-05-04 13:52:21 -07:00
moxiegirl
f2c568a3a4
Merge pull request #62 from moxiegirl/update-contribute
...
Update contribute
2016-05-04 13:49:02 -07:00
Tomasz Kopczynski
74d382ff8d
Docs: fixing typos in admin/supervisor
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2016-05-04 22:35:57 +02:00
Mary Anthony
b0db8d49bd
Fixing issue identified by customer
...
Entering Seb's comment
Fix the flags
Signed-off-by: Mary Anthony <mary@docker.com >
2016-05-04 13:34:23 -07:00
Joffrey F
6c29830127
Merge pull request #3418 from shin-/bump-1.7.1
...
Bump 1.7.1
2016-05-04 13:03:11 -07:00
Mary Anthony
ad97260d93
Updating the development process
...
Update with Michael's comments
Updated with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2016-05-04 12:54:38 -07:00
Alexander Morozov
e4a4570369
Merge pull request #22475 from Microsoft/jjh/twoconcurrentcontainers
...
Reduce time for TestRunTwoConcurrentContainers
2016-05-04 12:38:13 -07:00
Chun Chen
a7b2f87b06
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Update to device mapper
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
2016-05-04 12:32:14 -07:00
Riyaz Faizullabhoy
8d08576222
Merge pull request #716 from cyli/fix-signer-interface
...
Fix signer interface to conform to expected cryptoservice behavior
2016-05-04 12:04:25 -07:00
Joffrey F
0a9ab358bf
Bump 1.7.1
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:57 -07:00
Joffrey F
3c424b709e
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:57 -07:00
Joffrey F
47a40d42c7
Require latest docker-py version
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:57 -07:00
Aaron Nall
f316b448c2
Add missing log event filter when using docker-compose logs.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com >
2016-05-04 11:52:57 -07:00
André R
6bfdde6855
Clarify env-file doc that .env is read from cwd
...
Closes #3381
Signed-off-by: André R <ar@ez.no >
2016-05-04 11:52:57 -07:00
Joffrey F
2a08d4731e
Skip event objects that don't contain a status field
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:57 -07:00
Joffrey F
11d8093fc8
Support combination of shorthand flag and equal sign for host option
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:57 -07:00
Daniel Nephin
d0b46ca9b2
Upgade pip to latest
...
Hopefully fixes our builds.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-04 11:52:56 -07:00
Joffrey F
b7f9fc4b28
Define WindowsError on non-win32 platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:56 -07:00
Ben Firshman
70a605acac
Explain the explanation about file versions
...
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2016-05-04 11:52:56 -07:00
Ben Firshman
85b85bc675
Make validation error less robotic
...
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"
is now:
"ERROR: The Compose file './docker-compose.yml' is invalid because:"
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2016-05-04 11:52:56 -07:00
Patrice FERLET
b334b6f059
Fix the tests from jenkins
...
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.
close #3354
related #3263
Signed-off-by: Patrice Ferlet <metal3d@gmail.com >
2016-05-04 11:52:56 -07:00
Joffrey F
0c1c338a02
Force docker-py 1.8.0 or above
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-05-04 11:52:56 -07:00
johnharris85
f655a8af95
Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io>
2016-05-04 11:52:56 -07:00
johnharris85
f7cd94d4a9
Adding tests Signed-off-by: John Harris <john@johnharris.io>
2016-05-04 11:52:56 -07:00
johnharris85
e4d2d7ed8a
Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io>
2016-05-04 11:52:56 -07:00
Daniel Nephin
2a8c2c8ad6
Unit test for skipping network disconnect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-04 11:52:56 -07:00