Sven Dowideit
ac47a87740
Manually place the orchestration docs into the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
8d4459fffb
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
3e84b9e56a
Import docs from swarm, machine and compose repositories,
...
Also add the image spec from the code area to show we're building from the repo-root now
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
ab545aed4c
Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Brian Goff
3f39050637
Allow setting ulimits for containers
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-25 19:37:43 -05:00
Jessie Frazelle
321f4f0683
Merge pull request #11025 from crosbymichael/test-rm-dev
...
Reinit slice for each dir in search
2015-02-25 16:18:05 -08:00
Michael Crosby
8be8e41429
Reinit slice for each dir in search
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-25 15:53:07 -08:00
Michael Crosby
481e75203d
Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer
...
Added /dev paths to layer comparison
2015-02-25 14:52:31 -08:00
AnandkumarPatel
1a5ea50aa8
Remove comment and b.UtilizeCache check.
...
Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com>
2015-02-25 14:04:35 -08:00
Michael Crosby
9a2e58dd29
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
2015-02-25 13:46:18 -08:00
Rik Nijessen
7e7646c28a
Rename package timeout to timeoutconn.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-02-25 20:52:37 +01:00
AnandkumarPatel
2420c1f03b
Add cacheBusted flag which gets set on the first cache miss
...
Refactor of probeCache function
Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com>
2015-02-25 10:27:32 -08: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
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
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
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
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
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
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
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
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
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
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
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
Jessie Frazelle
11717741fd
Merge pull request #10989 from ahmetalpbalkan/win-cli/TestCliProxyProxyTCPSock-skip
...
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
2015-02-24 15:47:46 -08:00
Michael Crosby
f57c26553b
Add ContainerCreateResponse type
...
This type is produced on the server side and is a type safe struct that
can be encoded to json. It is consumed via the client.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-24 15:27:49 -08:00
Michael Crosby
435d654b09
Merge pull request #10837 from ahmetalpbalkan/win-cli/readContainerFile-with-exec
...
integration-cli: readContainerFileWithExec for links tests
2015-02-24 15:24:48 -08:00
Tibor Vass
e7dc7a6342
Merge pull request #9123 from rhatdan/commit-change
...
Patch to commit-change patch to add docker import support
2015-02-24 17:09:10 -05:00
Michael Crosby
bd95269fb9
Merge pull request #10935 from coolljt0725/fix_commit
...
Fix docker commit make a paused container to unpaused
2015-02-24 13:28:32 -08:00
Michael Crosby
a7cacbeb1d
Merge pull request #10957 from tianon/cleanup-autogen
...
Cleanup "autogen/" if we have successful build
2015-02-24 13:25:46 -08:00
Michael Crosby
478a9462e8
Merge pull request #10980 from miminar/fix-volumes-from
...
Fixed bad handling of "container not found" error
2015-02-24 13:23:34 -08:00
Michael Crosby
7d62ebf278
Merge pull request #10985 from jfrazelle/add-tools-doc
...
add tools doc
2015-02-24 13:13:45 -08:00
Michael Crosby
aa2b3c668b
Merge pull request #10984 from thaJeztah/do-re-mi
...
Order maintainers alphabetically
2015-02-24 13:13:08 -08:00
Jessie Frazelle
3b484c9554
Merge pull request #10988 from ahmetalpbalkan/TestBuildAddBadLinks-leftover-rm
...
Remove leftover debugging artifact in test
2015-02-24 12:47:55 -08:00
Ahmet Alp Balkan
6a9edfdc3b
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-24 12:04:33 -08:00
Ahmet Alp Balkan
e9e993922d
Remove leftover debugging artifact in test
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-24 11:44:14 -08:00
Jessica Frazelle
e63a693c6d
add tools doc
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-24 11:05:05 -08:00
Michael Crosby
7fed7d7eb4
Move stats api types into api/types package
...
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-24 10:47:47 -08:00
Michael Crosby
d0bc3537d7
Merge pull request #10982 from msabramo/CONTRIBUTING_tweaks
...
CONTRIBUTING.md: punctuation fixes
2015-02-24 10:02:58 -08:00
Dan Walsh
4a9fa9650b
I am only seeing the values I set
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:01:36 -05:00
Dan Walsh
17abfc3ddc
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:01:36 -05:00
Dan Walsh
5767548fa7
add docs for commit --change
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:01:36 -05:00
Michael Crosby
3210d13fc8
Return error on invalid --change command
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Docker-DCO-1.1-Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (github: rhatdan)
2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh
6d4cd446fe
instantiate the builder job in commit integration tests
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
2015-02-24 13:01:35 -05:00