dec7c25a51
Merge pull request #6244 from tiborvass/fix_release_checklist
...
Fix documentation for release-checklist
Upstream-commit: 443d923f08bfcd4c9cc0115bd84861980e23355a
Component: engine
2014-06-18 13:52:51 -07:00
45850ea1bb
Fix documentation for release-checklist
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 586e72218ceeb90d31900af198d5c865e4b3e6e4
Component: engine
2014-06-18 16:45:15 -04:00
c68805e2a6
Merge pull request #5878 from timthelion/docs-docker-readme
...
Add README.md file for the docker directory
Upstream-commit: 7c52ab7f83a7e37f283d4c237111adc18bdf22b4
Component: engine
2014-06-18 12:19:43 -07:00
e8772fc4e0
Merge pull request #6399 from dvberkel/master
...
use a numbered list for maintainers responsibility
Upstream-commit: 40b55a4174ab00d87ea9238929bb0f245eaa7be7
Component: engine
2014-06-18 11:57:46 -07:00
cbe82680cb
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
Upstream-commit: f53b922f40c43a58c1c7d3ff1ee489e137837a10
Component: engine
2014-06-18 11:02:17 -07:00
172faefd3c
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
df1151b70b
Merge pull request #6487 from vbatts/vbatts-error_info
...
adding a little uniqueness, to wrapped errors.
Upstream-commit: 331ae9c0f8a57b34b91b460350d0a354822d0091
Component: engine
2014-06-18 11:43:59 -04:00
17421dcea4
Merge pull request #6497 from SvenDowideit/awscli-changes
...
pin awscli to 1.3.9, and then complexify the sync's to make them more li...
Upstream-commit: 4195fc04941d4f780187bdcc65c0a9d240216cd6
Component: engine
2014-06-18 08:46:30 -05:00
3f0a0cfaf2
Merge pull request #6499 from SvenDowideit/add-redirects-for-renames
...
compared the 0.11 sitemap to the 1.0 one and these are the differences
Upstream-commit: ffe3ae7bfba3c17480ba11929fb7581b9089057f
Component: engine
2014-06-18 08:43:32 -05:00
74a8a70c93
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
Upstream-commit: 2294294e19798a1c2ceb90c5a31a532bb85869c7
Component: engine
2014-06-18 08:19:58 -05:00
14681fef9b
use a numbered list for maintainers responsibility
...
At the moment maintainers responsibility are spelled out with a hybrid
list. I.e. an unordered list with an associated number.
In this commit I the number list proper is used.
Docker-DCO-1.1-Signed-off-by: Daan van Berkel <daan.v.berkel.1980@email.com > (github: dvberkel)
Upstream-commit: cc96d312526dac5eff3e0521b921e08301715ce5
Component: engine
2014-06-18 14:31:26 +02:00
219f245ad1
Merge pull request #6500 from leeplay/userguide
...
fixed docker port command
Upstream-commit: 0c5d9626b82e97ef34b3c13bb581f0aadc0bffe2
Component: engine
2014-06-18 01:25:28 -05:00
43a017ff69
fixed docker port command
...
Upstream-commit: 438d26b4052307c29354edc9cd01e35d2e05137a
Component: engine
2014-06-18 15:01:29 +09:00
d83699654c
compared the 0.11 sitemap to the 1.0 one and these are the differences
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 42fe9327b9bb15354c5a7bdfee25f42e122fd994
Component: engine
2014-06-18 15:39:30 +10:00
61da490d61
pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 6b352d1cfe33cb3f5f64a3c18bb9931e9225adf8
Component: engine
2014-06-18 12:38:45 +10:00
3fdde76d71
Merge pull request #6490 from icecrime/6203-artifacts_on_events_output
...
Avoid erasing line for non-progress messages
Upstream-commit: f0ec9018194e9fddecfde29050aed1169c1fe94c
Component: engine
2014-06-17 16:26:51 -07:00
1d007f754c
Merge pull request #6199 from icecrime/event_subscription_refactoring
...
Event subscription refactoring
Upstream-commit: d0fe1147ea6bb98e87a573f078e1572f6061e04b
Component: engine
2014-06-17 17:39:28 -04:00
ba33babd07
Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach
...
Increase time before exit in TestMultipleAttachRestart
Upstream-commit: ec0fb311ed01615c0e2773cd224f43de94a762ab
Component: engine
2014-06-18 00:36:18 +03:00
43d16abb08
Merge pull request #6320 from LK4D4/fix_stdcopy_eof
...
Don't exit on eof in header reading in stdcopy
Upstream-commit: 4dcf4e9bd0e9c68369dd73fb8dfbf419e0ab68d6
Component: engine
2014-06-17 14:20:13 -07:00
5490b8933d
Merge pull request #6489 from vieux/fix_mflags_panic
...
prevent panic when empty flag
Upstream-commit: 3336bdf5b5ac9753df549a8434de820c06260a65
Component: engine
2014-06-17 14:04:20 -07:00
a1e9b8d6d0
Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
...
Convert TestGetContainersByName into a unit test
Upstream-commit: ba4ae2c46d0ea77eecb05b2b01405dbeffafc58b
Component: engine
2014-06-17 14:01:42 -07:00
da13f8faf7
Merge pull request #6485 from crosbymichael/update-libcontainer
...
Update libcontainer dependency to 77ffd49dfedbc78a
Upstream-commit: 092826152cdfcb125bafdf5c9fed911e304feccf
Component: engine
2014-06-17 16:57:35 -04:00
928e8a4f4b
Merge pull request #6471 from LK4D4/more_buildfile_tests_to_cli
...
Move more buildfile tests to integration-cli
Upstream-commit: c7fdd51eb6407fba41200e7a14f652519b179b71
Component: engine
2014-06-17 13:54:55 -07:00
2883b4234a
prevent panic when empty flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 661a1e90263cc348c17620cf0b250bf552dd4056
Component: engine
2014-06-17 20:45:57 +00:00
c5861c6a61
Avoid erasing line for non-progress messages
...
The JSONMessage.Display methods erases the entire line by outputting the <ESC>[2K\r sequence before displaying the message content. This is not necessary for messages other than progress indicators, and introduces unwanted characters in the /events output.
Fixes #6203 .
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
Upstream-commit: 3807f8b708b60588526f555190d14a37db408450
Component: engine
2014-06-17 22:40:34 +02:00
e3f7ac181c
Update libcontainer dependency to 77ffd49dfedbc78a
...
Fixes #6256
Fixes #6383
Fixes #6414
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 698ded75b9aa076f4278398e56fa95e90e900d2b
Component: engine
2014-06-17 13:09:36 -07:00
1c06016fa3
adding a little uniqueness, to wrapped errors.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4902f047d3c6c37138a51bee05a3a48552619884
Component: engine
2014-06-17 16:07:34 -04:00
5ad6516933
Refactor events publishing
...
Events subscription (/events API endpoint) attributes pseudo-unique identifiers to incoming subscribers: originally its host, then its subscription time. This is unecessary and leads to code complexity.
Introduce a JSONMessagePublisher to provide simple pub/sub mechanism for JSONMessage, and rely on this new type to publish events to all subscribed listeners. The original logic is kept for the 'since' and 'until' parameters, and for client disconnection handling.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
Upstream-commit: d0c4e448632f49b73bf63862a4b20b142ff7f2c9
Component: engine
2014-06-17 21:56:22 +02:00
017a78b3c1
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
2014-06-17 23:44:30 +04:00
551ab6b3bc
Merge pull request #6356 from mattyw/master
...
fixed a broken link in the readme
Upstream-commit: 52edbe6a23f3c052d19aedccc5efb6571bfc24f8
Component: engine
2014-06-17 11:00:46 -07:00
c38b2639f5
fixed a broken link in the docs
...
Docker-DCO-1.1-Signed-off-by: Matt Williams <lp@mattyw.net > (github: mattyw)
Upstream-commit: d4ec4d6e9b273bfc6a1f0e88edcddcd9e742bbab
Component: engine
2014-06-17 18:36:59 +01:00
da74dc358a
Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374
...
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com > (github: jstoja)
Upstream-commit: 207d7807af35a3f1ee98e6401bff83146d2450f8
Component: engine
2014-06-18 00:38:04 +08:00
d413b71710
Merge pull request #6470 from adelton/dns-no-hostname
...
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
Upstream-commit: bf9482987f55d60c50fdf70525d20fd8ddd10e5e
Component: engine
2014-06-17 10:13:12 -05:00
fcec122617
Merge pull request #6473 from leeplay/userguide
...
fix missing TAG for docker run
Upstream-commit: 0ba7f934ee0fb3bf0953b1456792443e7faf0921
Component: engine
2014-06-17 06:23:06 -05:00
13cfd39f56
Merge pull request #6469 from mariusv/patch-1
...
fixed Automated Build page link
Upstream-commit: 087acccf0ca8d43b7a9181961035f765dceafb5b
Component: engine
2014-06-17 06:16:35 -05:00
8d4f489b58
fix wrong command
...
Upstream-commit: cac97b6bd86fb3b741ff3ce75cf422ef378854b9
Component: engine
2014-06-17 17:49:34 +09:00
2ef780f316
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
...
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com > (github: adelton)
Upstream-commit: e278082c213d887322270eefb96fda6d76a082c0
Component: engine
2014-06-17 09:40:59 +02:00
f48cbf9c53
Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 690711b5840be388fb13fb72856de337bdf645c7
Component: engine
2014-06-17 11:39:47 +04:00
3ac290e972
Move TestBuildOnBuildForbiddenFromTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1c8ec01c551b3cfac8548d7fd22a50b3c236e362
Component: engine
2014-06-17 11:36:45 +04:00
a96755d882
fixed Automated Build page link
...
Corrected the link in the Automated Builds page from https://registry.hub.docker.io/builds/ to https://registry.hub.docker.com/builds/ as the *.io is not working
Upstream-commit: 2ed8b220998c11a0580adb10dc8647864748522a
Component: engine
2014-06-17 08:24:56 +01:00
17786f89f8
Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1e0e86360f8fefbeb3d70642aa0402bcb0c97a1a
Component: engine
2014-06-17 11:24:47 +04:00
417be2b8be
Move TestBuildOnBuildTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 2629e2ec236a377973e7be296013e366b4074d44
Component: engine
2014-06-17 11:14:45 +04:00
0c3b5a8a2c
Move TestBuildFailsDockerfileEmpty to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 08a10f936b4b5a69d3be6d320499c025a399fddb
Component: engine
2014-06-17 11:06:44 +04:00
85c70b022e
Move TestBuildFails to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: d3023f25f5c9e1173fe1cf1dbb449a926dc85cfd
Component: engine
2014-06-17 11:06:40 +04:00
285461876d
Move TestBuildInheritance to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: f1d7ed35bd17c5e8e8f4d1882b5e98ae5419e9f1
Component: engine
2014-06-17 11:05:45 +04:00
fd55280b29
Move TestBuildADDFileNotFound to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 62d97afaf8d328b42c028323f10c3f4782f03561
Component: engine
2014-06-17 11:05:36 +04:00
f7987f5c93
Move TestForbiddenContextPath to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 686786f107582c27c69a6f40655c8fc52a8e4d00
Component: engine
2014-06-17 10:38:45 +04:00
f81562b040
Move TestBuildEntrypointRunCleanup to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c5b82f5e8dd5c519330e02502e5b9f9031a6509a
Component: engine
2014-06-17 10:16:36 +04:00
6e1924abe9
Convert TestGetContainersByName into a unit test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: c44c98edec6822edf17cc969038e21be6ccdbd93
Component: engine
2014-06-17 07:56:57 +02:00
35f7ca64f8
Merge pull request #6464 from SvenDowideit/pr_out_exclaimation_marks_cause_shell_pain_simplify_it_away
...
exclaimation marks cause shell pain - simplify it away
Upstream-commit: da327c8fa361affa2c453bf1c103b8120f4ba059
Component: engine
2014-06-16 18:13:24 -07:00
