Victor Vieux
2acbea1149
Merge pull request #417 from frodenas/fix-createentries
...
Ignore empty addresses when creating discovery entries
2015-02-25 10:15:16 -08:00
Ben Firshman
1c8eb08e1e
Remove binaries in build after building image
...
This will bail before deleting the binaries if it can't connect to a
Docker host. Sometimes I build machine binaries when I haven't got a
machine and then it removes the machine binaries and then I can't
use machine to create a machine and then the universe implodes. :(
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-02-25 18:14:38 +00:00
Aanand Prasad
35d5d1a5b1
Build and link to getting started guides
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-02-25 17:54:02 +00:00
Aanand Prasad
72003de737
Merge pull request #1020 from bfirsh/move-docs-index-higher-up-on-compose-docs
...
Move docs index higher up on index page
2015-02-25 17:52:56 +00:00
Ben Firshman
a0db5bee3e
Merge pull request #1022 from aanand/previously-known-as
...
Add 'previously known as Fig' note to README.md
2015-02-25 17:52:04 +00:00
Ben Firshman
59c45e3398
Merge pull request #1026 from aanand/fix-requests-version-range
...
Fix requests version range
2015-02-25 17:51:39 +00:00
Jessie Frazelle
21811f0786
Merge pull request #11001 from ahmetalpbalkan/win-cli/TestRunNoDupVolumes-fix
...
integ-cli: pass unix paths to TestRunNoDupVolumes
2015-02-25 09:47:30 -08:00
Aanand Prasad
ea8364fd11
Add 'previously known as Fig' note to README.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-02-25 17:39:12 +00:00
Alexander Morozov
711175d666
Merge pull request #11004 from ahmetalpbalkan/win-cli/TestRunBindMounts-skip
...
integ-cli: skip TestRunBindMounts (same-host daemon requirement)
2015-02-25 09:37:15 -08:00
Aanand Prasad
cf6b09e94b
Fix requests version range
...
It was more permissive than docker-py's, resulting in an incompatible
version (2.5.x) being installed.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-02-25 17:34:22 +00:00
Evan Hazlett
7a101ac92c
refactor directories to machines, certs, cache
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-25 12:32:41 -05:00
John Howard (VM)
69246e1527
api\server: Factored out UnixHttp on Windows, supported on Linux only.
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-02-25 09:24:34 -08:00
Ben Firshman
66555aa69b
Merge pull request #1021 from aanand/update-urls
...
Update URLs in documentation
2015-02-25 16:48:28 +00:00
Rik Nijessen
690a85797e
Move TimeoutConn to seperate pkg dir.
...
Fixes #10965
Signed-off-by: Rik Nijessen <riknijessen@gmail.com >
2015-02-25 17:09:47 +01:00
Evan Hazlett
502945f577
Merge pull request #608 from bfirsh/use-random-strategy-for-swarms
...
Use random strategy for Swarms
2015-02-25 10:34:50 -05:00
Ben Firshman
aa3940deb7
Use random strategy for Swarms
...
Makes a better demo.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-02-25 15:06:51 +00:00
Aanand Prasad
bb943d5cb5
Update URLs in documentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-02-25 14:58:03 +00:00
Phil Estes
f8a146311d
Correct --add-host documentation regarding host IP address retrieval
...
Fixes: 10855
The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses. Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-02-25 09:56:58 -05:00
Ben Firshman
178c50d46f
Move docs index higher up on index page
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-02-25 14:09:30 +00:00
Ben Firshman
32cdabefc2
Merge pull request #1016 from SvenDowideit/docs-tweak
...
Add an index to the bottom of the Compose docs as they're scattered arou...
2015-02-25 13:55:47 +00:00
Sven Dowideit
5b07c581e0
Add an index to the bottom of the Compose docs as they're scattered around docs.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-25 23:38:25 +10:00
Ben Firshman
17bbb9d357
Merge pull request #1017 from aanand/swarm-doc
...
Document Swarm integration
2015-02-25 12:53:07 +00:00
Aanand Prasad
ec2966222a
Document Swarm integration
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-02-25 10:45:40 +00:00
Ahmet Alp Balkan
f6e95ef3a4
integ-cli: a few context cleanups
...
These cleanup calls were forgotten, adding these to
reduce garbage on windows CI machines.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-25 01:09:06 -08:00
Ahmet Alp Balkan
e2aa8f0cd9
integ-cli: skip tests launching registry-v2
...
Some pull/push tests are launching `registry-v2`
binary which is compiled and installed if the tests
are running in-container through `make test-integration-cli`.
However, registry is not supported to run on non-linux
platforms and we can't really spin up any registry-v2
containers in the remote DOCKER_TEST_HOST at this point.
Just skipping those with the new TestRequirement called
`RegistryHosting`.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 23:19:59 -08:00
Evan Hazlett
40162e0e11
Merge pull request #607 from SvenDowideit/validate-docs
...
Docs updates
2015-02-25 01:46:56 -05:00
Sven Dowideit
b1622fb88e
remove a, remove a duplicate line
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-25 16:35:06 +10:00
Ferran Rodenas
cecdd7df02
Ignore empty addresses when creating discovery entries
...
Signed-off-by: Ferran Rodenas <frodenas@gmail.com >
2015-02-24 22:10:31 -08:00
Sven Dowideit
d846affb62
Expand on the Oracle Virtualbox docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-25 15:11:00 +10:00
Ahmet Alp Balkan
26444e5e9a
integ-cli: skip TestRunBindMounts (same-host daemon requirement)
...
`TestRunBindMounts` requires daemon to be on the same host.
Running this cli test on Linux is fair enough coverage for
this functionality and we can skip this for platforms where
daemon cannot run side-by-side with the cli for now.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 21:04:47 -08:00
Sven Dowideit
009ff3187a
Add some more details to the Dicital Ocean driver
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-25 14:34:11 +10:00
Ahmet Alp Balkan
5ecab9e831
Support windows style dockerfile paths for build cmd
...
Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:
docker build -f dir/file .
fails on windows because those are unix paths. Instead, on
windows accept windows style paths like:
docker build -f dir\file .
and convert them to unix style paths using the helper we
have in `pkg/archive` so that daemon can correctly locate
the path in the context.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 20:23:53 -08:00
Sven Dowideit
0db1cf61c7
Add more details to the Azure docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-25 14:13:43 +10:00
Evan Hazlett
36665be4ef
Merge pull request #602 from ehazlett/get-ip-retry
...
allow retries for GetIP when issuing cert
2015-02-24 22:43:39 -05:00
Ahmet Alp Balkan
db1f8f7481
integ-cli: pass unix paths to TestRunNoDupVolumes
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 18:50:55 -08:00
Jeffrey Morgan
2107afb82a
Merge pull request #201 from kitematic/fix-install
...
Save vms on upgrade, lower minimum virtualbox requirement to 4.3.0
2015-02-24 21:29:48 -05:00
AnandkumarPatel
1e746a8a2b
Set UtilizeCache to false on cache miss
...
Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com >
Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com >
2015-02-24 18:29:26 -08:00
Jessica Frazelle
9aff77156b
Fix events test so it doesnt need new daemon
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
2015-02-24 18:28:16 -08:00
Jeffrey Morgan
53385ca50e
Merge branch 'master' into fix-install
...
Conflicts:
src/Setup.react.js
2015-02-24 21:25:18 -05:00
Jeffrey Morgan
3a9017ec3a
Fix upgrade detection
2015-02-24 21:15:51 -05:00
Evan Hazlett
66ed197149
Merge pull request #589 from saturnism/google-scopes
...
Add google-scopes option to specify Compute Engine scopes
2015-02-24 20:45:05 -05:00
Evan Hazlett
882928530b
Merge pull request #604 from nathanleclaire/multicmds
...
Make multiple machine name arguments work for kill, restart, rm, start, stop, and upgrade
2015-02-24 20:31:55 -05:00
Evan Hazlett
2ce177046a
show errors in debug (feedback from @md5)
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 20:29:25 -05:00
Alexander Morozov
309eec2378
Merge pull request #10999 from ahmetalpbalkan/win-cli/SameHostDaemon-skips-3
...
integ-cli: Skip some exec tests requiring same-host daemon
2015-02-24 17:17:23 -08:00
Ahmet Alp Balkan
e6f88f091d
integ-cli: Skip some exec tests requiring same-host daemon
...
This skips tests:
- `TestRunExecDir`
- `TestRunMutableNetworkFiles`
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 16:39:42 -08:00
Jessie Frazelle
1060a5334e
Merge pull request #10995 from ahmetalpbalkan/win-cli/SameHostDaemon-skips-2
...
integ-cli: Skip new tests requiring same-host daemon
2015-02-24 16:36:11 -08:00
Jeffrey Morgan
0a033e807b
Lower virtual box req. Fix upgrade
2015-02-24 19:32:22 -05:00
Jessie Frazelle
8974f61fa3
Merge pull request #10997 from ahmetalpbalkan/win-cli/TestSaveDirectoryPermissions-fix
...
integ-cli: remove bash dependency from TestSaveDirectoryPermissions
2015-02-24 16:31:04 -08:00
Ahmet Alp Balkan
cfc8372c0a
integ-cli: Skip new tests requiring same-host daemon
...
This skips tests:
- `TestExecAfterContainerRestart`
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 16:30:22 -08:00
Ahmet Alp Balkan
c3e28351a1
integ-cli: remove bash dependency from TestSaveDirectoryPermissions
...
Use the new `runCommandPipelineWithOutput` helper to
remove bash dependency required for piping in
`TestSaveDirectoryPermissions`.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 15:52:06 -08:00