Commit Graph

15703 Commits

Author SHA1 Message Date
cfff66c7bb Document in the experimental section
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
Upstream-commit: 8d0486832dafb775e93dafd1229fcf7e81ee4a28
Component: engine
2015-05-22 17:00:04 -07:00
f23ada12c4 Move Documentation changes out or this PR.
The will come in a follow up PR inside the experimental section.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ab8a5bcf04243577516207257c7fe5ec8257a9f4
Component: engine
2015-05-22 16:58:48 -07:00
fd9e9a6b5b Propagate unmount events to the external volume drivers.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d592778f4a75d36745aaffaf73c0775ecd420545
Component: engine
2015-05-22 16:43:34 -07:00
801e8947c6 Mark volume drivers and plugins as experimental in the documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a867c1b70a0ee3db2793ab1a8f56d24beaa41388
Component: engine
2015-05-21 20:34:17 -07:00
39e76a661b Allow named volumes for external drivers.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3bf0ca31cf61e445554326ba405cc32c7ef64189
Component: engine
2015-05-21 20:34:17 -07:00
778241cd3a Make API volume-driver dependent on 'experimental'
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2653c7c16cf87029c7e2e35427fbd1c83a0c96ba
Component: engine
2015-05-21 20:34:17 -07:00
e89556546b Mark --volume-driver as experimental
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4fc37a1ede58153bfa6aa5c9aa0f2903f18d572f
Component: engine
2015-05-21 20:34:17 -07:00
3dacf0ed87 Disable -v overloading
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
Upstream-commit: 7da5a7eb6637222a313e9d6e7fbcd5dd472154e3
Component: engine
2015-05-21 20:34:17 -07:00
89782c55eb Volumes refactor and external plugin implementation.
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
0b16a9b9c3 Merge pull request #13399 from hqhq/hq_fix_run_test
Fix test failure when --net none build
Upstream-commit: 23e8dff9e7d06de09a17dd3174f8cf26d2067eb4
Component: engine
2015-05-21 21:50:44 -04:00
ab1e39f7d4 Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
Windows: graphdriver refactor
Upstream-commit: 88275e94d62896383b54209b5a8691ed3cffe122
Component: engine
2015-05-21 21:28:24 -04:00
3c9aadce7f Merge pull request #13386 from icecrime/experimental_suffix_version
Suffix experimental version / fix warning output
Upstream-commit: 2b8271399e0871efd769a79b7ae43b2f51358a3a
Component: engine
2015-05-21 17:42:23 -07:00
f7e26caad3 Fix test failure when --net none build
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c0dd8538db070a055150a0da76d093d5d196ab42
Component: engine
2015-05-22 08:21:09 +08:00
b53e996e55 Add suffix to experimental builds version
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
2015-05-21 16:27:42 -07:00
329dcd34ed Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes
Publish release notes for latest cs Docker engine
Upstream-commit: ddf783ed2fc4f6750daf5b2298b7684038b4d632
Component: engine
2015-05-22 09:16:12 +10:00
d5d48e47c8 Publish release notes for latest cs Docker engine
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 740b1b5a2d89ef8d2c4c606636e5b42234298734
Component: engine
2015-05-22 09:14:06 +10:00
d60fe719f4 Merge pull request #13336 from calavera/document_missing_build_flags
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
2015-05-22 01:03:37 +02:00
21792a8e30 Merge pull request #13393 from tiborvass/fix-token-bug
registry: Fix auth bug
Upstream-commit: 6c5a140f8a4470c45f3a9302c00c398b75c23549
Component: engine
2015-05-21 15:58:17 -07:00
a0524deeed Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
2015-05-21 15:30:21 -07:00
50f6b1411a Document missing build flags.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
2015-05-21 15:02:00 -07:00
ebafe2bed3 registry: fix auth bug
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fc29f7f70b34ae11e1084a66cf401ff11b4573e7
Component: engine
2015-05-21 16:53:22 -04:00
522037006a Merge pull request #13387 from cpuguy83/fix_ngroutine_test
Better checking for LogsFollowGoroutinesWithStdout
Upstream-commit: 7fffcfff32ce6c4379f3b90a1570847b06d75a8c
Component: engine
2015-05-21 12:31:57 -07:00
97013d9e36 Better checking for LogsFollowGoroutinesWithStdout
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2805ff1ecee7cd850a08a00ee9448b54beb4032b
Component: engine
2015-05-21 14:13:01 -04:00
8e905a0abb Merge pull request #13371 from theadactyl/patch-2
Add theadactyl as community manager
Upstream-commit: 523d2f6a04d59883d0a45c177209e04729a4daa6
Component: engine
2015-05-21 11:06:38 -07:00
832c917cec Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
Add missing return error check for container.WriteHostConfig() in container_linux.go
Upstream-commit: 00e78a18ba56970cdb213f41f98fba04c4c7b84b
Component: engine
2015-05-21 09:32:52 -07:00
397e4d3e91 Merge pull request #13383 from duglin/CreateRMTest
Add a 'docker create' + 'docker rm' testcase
Upstream-commit: 0ac5e8a1709b09f311f9032c7e139b66ce0bccb5
Component: engine
2015-05-21 09:32:32 -07:00
aa89cbdb44 Add a 'docker create' + 'docker rm' testcase
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 012e588a744ce3000d58a7562a1a8291a7fe10ae
Component: engine
2015-05-21 07:30:51 -07:00
aee8d65658 Add missing return error check
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
2015-05-21 17:03:43 +08:00
a90378a2ea Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
Make docker ps --size show virtual size really work
Upstream-commit: ef0a14559332f443a0f111dd22a43b13de3aa967
Component: engine
2015-05-20 18:32:11 -07:00
986a53d09e Make docker ps --size show virtual size really work
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
2015-05-21 08:57:11 +08:00
3ad2c8df4b Merge pull request #13326 from tianon/squeeze-lts
Fix "squeeze" detection in contrib/mkimage/debootstrap
Upstream-commit: 366fe46c6a6e604329711a9edbe21f0c6fe31fc9
Component: engine
2015-05-20 17:41:27 -07:00
6ccd65f901 Merge pull request #13195 from albers/completion-custom-host
respect -H in bash completion
Upstream-commit: f74d9b8672df985e18f5a1d0b54c6d38618e9b11
Component: engine
2015-05-20 17:31:16 -07:00
f1ceb1ec3a Merge pull request #13270 from samsabed/gpg-dockerfile
Trivial use port 80 for dev Dockerfile gpg
Upstream-commit: c68915ff7072a03b59deb4cf0f4af20d0bb382be
Component: engine
2015-05-20 17:30:01 -07:00
1c051ef581 Merge pull request #13241 from hqhq/hq_enhance_checkconfig
Enhance check-config.sh
Upstream-commit: 28465588d07fe9c37573dec52939d44b115db6ee
Component: engine
2015-05-20 17:25:30 -07:00
60c6ee21a9 Add theadactyl as community manager
Added Community Manager role to Org.Operators and added theadactyl as community manager

Signed-off-by: Thea Lamkin <thea@docker.com>
Upstream-commit: f86d39c6b6f4945afd80dbfcdd0c623b9c71cfb8
Component: engine
2015-05-20 16:21:36 -07:00
7e35f8d0a4 Merge pull request #13366 from moxiegirl/162-release-notes
Updating with 1.6.2-cs5 notes
Upstream-commit: 2bf409d4eff3836dd4cc82bc8cb656af2a2dd63d
Component: engine
2015-05-20 15:03:27 -07:00
4a24c72f56 Updating with 1.6.2-cs5 notes
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7554949da654fb55dd1bccc3308ef12c013a16d5
Component: engine
2015-05-20 14:39:00 -07:00
850c8c5ac2 Merge pull request #13263 from rajdeepd/dry-run-test-2
TestCase for CpuShares and Cpuset
Upstream-commit: 0fddb6ad7e2505a8c1a2c8273ddc97573256e372
Component: engine
2015-05-20 23:33:42 +02:00
0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
2015-05-20 13:04:28 -07:00
90e040bb15 Merge pull request #13078 from Microsoft/10662-pkgarchive
Windows: Archive package changes for Windows daemon
Upstream-commit: 79532e6d5897516b955fd258060fc34a6dfa86f9
Component: engine
2015-05-20 12:39:26 -07:00
045dd55a7d Add DOCKER_EXPERIMENTAL environment variable
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
2015-05-20 12:21:17 -07:00
673769117b Merge pull request #13346 from mrjana/cnm_integ
Fix network connectivity problem for non-root users
Upstream-commit: dec13cef2a6600f01158668a9a31ba0d976b5f5f
Component: engine
2015-05-20 12:02:07 -07:00
a4089aa4e2 Merge pull request #13359 from davidxia/increase-docker-kill-timeout
Increase upstart kill timeout to 20 seconds
Upstream-commit: 76a5fb3e1e329bf38ee6aca29bbe6f3b1b8188c6
Component: engine
2015-05-20 11:54:07 -07:00
56af424158 TestCase for CpuShares and Cpuset
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: ebe344d34b9d708b3634c2e17929cae1abb61ae8
Component: engine
2015-05-20 11:32:48 -07:00
f3325976cc Increase upstart kill timeout to 20 seconds
Give Docker more time to kill containers before upstart kills Docker.
The default kill timeout is 5 seconds.
This will help decrease the chance of but not eliminate the chance of
orphaned container processes.

Signed-off-by: David Xia <dxia@spotify.com>
Upstream-commit: 2f9e7a067a7273a0f344c1c9a6397e4bb61d7554
Component: engine
2015-05-20 14:20:46 -04:00
baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
2015-05-20 11:13:56 -07:00
6fda96cea6 Fix network connectivity problem for non-root users
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
2015-05-20 17:51:20 +00:00
c2ea54a24b Merge pull request #13356 from LK4D4/test_double_nethost
Test for two containers in --net=host
Upstream-commit: c6d9c904af26ce4855069d9fb0bd2d8312cb18ce
Component: engine
2015-05-20 13:17:16 -04:00
0b8fdcc9ca Merge pull request #13354 from jacobat/comment-fix
Fix wording in comment
Upstream-commit: b0315e44720fbc27a05aaf406430782eaf1c3eaf
Component: engine
2015-05-20 09:44:23 -07:00
7bb1c9e819 Test for two containers in --net=host
This is test for regression which was encountered during libnetwork
merging.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 7e5902c92d9a01d653a97685376def427e1f0750
Component: engine
2015-05-20 09:35:28 -07:00