Brian Goff
c136a33c5b
Fallback to file polling for jsonlog reader on err
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-11-05 10:05:05 -05:00
Antonio Murdaca
22ef779db9
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
2015-11-05 15:15:52 +01:00
Brian Goff
bb9eca9036
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
2015-11-05 09:15:28 -05:00
Antonio Murdaca
71db33738d
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
2015-11-05 13:05:28 +01:00
Zhang Wei
fbed26297d
Include container names in network inspect
...
This commit makes `docker network inspect` print container names as
service discovery is based on container name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-11-05 19:16:13 +08:00
Vincent Demeester
f267e4be54
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
2015-11-05 12:11:57 +01:00
Vincent Demeester
5baf56ca00
Merge pull request #17717 from WeiZhang555/docsAndTypo
...
Fix docs typo and wrong word
2015-11-05 11:35:33 +01:00
Mikhail Zholobov
d07d443466
test/integration: Remove machine forcibly, without stopping
...
Unlikely "rm -f", commands "stop" and "rm" will be failed if machine doesn't exist.
Forced removing guarantees that integration tests won't fail on the cleanup step.
Signed-off-by: Mikhail Zholobov <legal90@gmail.com >
2015-11-05 12:35:25 +02:00
Asbjørn Enge
8d74591407
Added ARG instruction and aligned with src repo
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2015-11-05 10:56:07 +01:00
David Gageot
1f0de8f84e
FIX #2167 b2d download timeout during upgrade
...
+ Download boot2docker before we stop the machine.
+ Use default(longer) timeout
+ Show b2d download progress
+ Fix typo
+ Add log before stop
Signed-off-by: David Gageot <david@gageot.net >
2015-11-05 09:39:33 +01:00
Victor Vieux
9ddb3c474c
Merge pull request #1381 from auzias/master
...
Fixed typos
2015-11-05 00:28:26 -08:00
auzias
95c95812a6
Typos correction
...
Signed-off-by: auzias <github@auzias.net >
2015-11-05 08:41:45 +01:00
Alexander Morozov
1eafc7264c
Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error
...
Reutrn immediately when inspect connection failed
2015-11-04 22:43:02 -08:00
Zhang Wei
725b7c9d43
Fix docs typo and wrong word
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-11-05 14:17:37 +08:00
David Gageot
29a0ef6853
Merge pull request #2115 from dgageot/more-cleanup-for-more-tests
...
Add CommandLine interface for commands
2015-11-05 06:20:36 +01:00
David Gageot
99d6fe134d
Introduce CommandLine interface
...
Signed-off-by: David Gageot <david@gageot.net >
2015-11-05 06:07:57 +01:00
Zhang Wei
0ebdac8bee
Fix --cluster-store option parser
...
`--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes
sure that KV-URL contains no "://"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-11-05 11:45:08 +08:00
Nathan LeClaire
ede8f2a32f
Merge pull request #2166 from kunalkushwaha/swarm-proxy
...
Environment variables passed to provision machine, will be passed to …
2015-11-04 18:50:41 -08:00
Ying Li
0f3a194cf2
Merge pull request #265 from HuKeping/master
...
Replace tab with space on script
2015-11-04 18:33:23 -08:00
Jeffrey Morgan
ea0f607965
Merge pull request #1179 from kitematic/unified-build
...
Ability to build windows binaries on Mac
2015-11-04 18:31:40 -08:00
Kunal Kushwaha
8d2ae162b7
Environment variables passed to provision machine, will be passed to containers for swarm also.
...
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
2015-11-05 11:27:58 +09:00
Brian Goff
72aeb63a47
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-11-04 21:17:05 -05:00
Nathan LeClaire
6326e6732d
Revise commands in Compose section of multi-host quickstart
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-04 17:44:01 -08:00
Nathan LeClaire
6be950f1c0
Merge pull request #2117 from dmp42/08-carry-on-2033
...
Carry on commits from #2033
2015-11-04 16:41:40 -08:00
Brian Goff
f18c5e9714
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
2015-11-04 19:23:11 -05:00
Jessica Frazelle
d0a4b216a6
update release script and release process
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-11-04 16:20:04 -08:00
Sebastiaan van Stijn
1ef3b1f857
Merge pull request #17694 from hrldcpr/patch-1
...
fix documentation inconsistency for volume create
2015-11-05 01:16:09 +01:00
Jessica Frazelle
3f27479435
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-11-04 16:01:19 -08:00
Sebastiaan van Stijn
236913f4e8
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
2015-11-05 00:50:08 +01:00
French Ben
736673776b
Added larger set for org and user repo - fixes 1158
...
Signed-off-by: French Ben <me+git@frenchben.com >
2015-11-04 15:43:48 -08:00
Jess Frazelle
9c1006c8bf
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
2015-11-04 15:39:19 -08:00
Nathan LeClaire
828cb12e2c
Merge pull request #2177 from dmp42/13-lint-attempt-again
...
Lint, step 1
2015-11-04 15:29:52 -08:00
Vincent Demeester
1711a8f437
Added additional guidance for signing off git commits when contributing.
...
From docker/docker#17565 , @pmalmgren (Peter Malmgren <ptmalmgren@gmail.com >)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-04 23:47:20 +01:00
Jeffrey Morgan
ee819f8725
Ability to build windows binaries on Mac
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-04 14:46:52 -08:00
Stefan J. Wernli
9112d90b27
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-11-04 14:43:50 -08:00
Nathan LeClaire
47aa16cff4
Merge pull request #2135 from janeczku/plugin-versioning
...
Fail gracefully when plugin binary implements outdated API
2015-11-04 14:40:54 -08:00
David Calavera
fa0ee3fb89
Merge pull request #17705 from alexwlchan/patch-1
...
Fix typo in dockervolumes.md
2015-11-04 14:26:47 -08:00
Daniel Nephin
50f06c6ba2
Merge pull request #2325 from dnephin/fix_jenkins_build
...
Fix jenkins CI
2015-11-04 17:25:17 -05:00
Olivier Gambier
19fc49b58a
Lint, step 1
...
The easy stuff
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-11-04 14:17:58 -08:00
Alex Chan
40dc0c4861
Fix typo in dockervolumes.md
...
Signed-off-by: Alex Chan <alex@alexwlchan.net >
2015-11-04 22:13:35 +00:00
Richard Scothern
362ae9cc41
Merge pull request #1156 from RichardScothern/manifest-verification
...
Manifest Verification
2015-11-04 14:09:12 -08:00
Richard Scothern
7ed02ea1db
Merge pull request #1161 from stevvooe/add-status-badges
...
Add nice status badges to README
2015-11-04 14:08:46 -08:00
Brian Goff
fe66fdd18c
Fix potential races in the volume store
...
Uses finer grained locking so that each volume name gets its own lock
rather than only being protected by the global lock, which itself needs
to be unlocked during cetain operations (`create` especially`)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-11-04 16:59:47 -05:00
Alexander Morozov
b2f14f9bec
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
2015-11-04 13:37:45 -08:00
Alessandro Boch
54d22cbd9a
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-11-04 13:27:17 -08:00
Sebastiaan van Stijn
92132a7841
Merge pull request #17698 from moxiegirl/nigel-fixes
...
Fixing BTRFS > Btrfs
2015-11-04 22:05:27 +01:00
Stephen J Day
5882b97ef2
Add nice status badges to README
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-11-04 12:48:18 -08:00
Jeffrey Morgan
07d75d534e
Fix bug where upgrade would fail if fish is the default shell
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-04 12:35:34 -08:00
Daniel Nephin
385b4280a1
Fix jenkins CI by using an older docker version to match the host.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-04 15:33:37 -05:00
Sally O'Malley
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-11-04 15:18:50 -05:00