beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13417 commits 14 branches 412 tags 338 MiB
Commit graph

13417 commits

This branch
This branch
All branches
Author SHA1 Message Date
Doug Davis
1d6f469764 Merge pull request #11036 from liusdu/fix-typo 
fix a minor typo in daemon/exec.go
 2015-02-26 10:02:46 -08:00
Jessie Frazelle
9324cdac07 Merge pull request #10831 from MalteJ/ipv6-ndp-proxy 
Adding IPv6 NDP Proxying documentation
 2015-02-26 07:19:36 -08:00
Sven Dowideit
7a93d52ea4 Merge pull request #11039 from SvenDowideit/fix-missing-compose-docs 
Missed to added doc files
 2015-02-27 01:13:35 +10:00
Sven Dowideit
7646e3f957 Missed to added doc files 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-27 01:10:50 +10:00
Liu Hua
5b794c413a fix a minor typo in daemon/exec.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-02-26 19:11:27 +08:00
Tibor Vass
7e2328b76e Merge pull request #10869 from SvenDowideit/extract-docs-base 
Extract docs base
 2015-02-25 23:16:46 -05:00
Sven Dowideit
6d4b0f5334 update the mkdocs.yml to add new docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 12:11:29 +10:00
James Turnbull
f8dbcdc599 Merge pull request #10940 from 1HLtd/master 
docs/man/docker.1.md: spelling mistake fix
 2015-02-25 20:45:46 -05:00
Sven Dowideit
0365e8c204 set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
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
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
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
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
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
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
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
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
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
Daniel, Dao Quang Minh
b30257ccf9 support changes in commit job 
In addition to config env, `commit` now will also accepts a `changes` env which
is a string contains new-line separated Dockerfile instructions.
`commit` will evaluate `changes` into `runconfig.Config` and merge it with
`config` env, and then finally commit a new image with the changed config

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
Dan Walsh
7f091eca70 build_config job: parse dockerfile ast into config 
Instead of building the actual image, `build_config` will serialize a subset of
dockerfile ast into *runconfig.Config

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:35 -05:00
Daniel, Dao Quang Minh
f8e77dfb3d pass --change changes to the commit job 
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
Abin Shahab
3bd3f7854a Restored removed docker init options 
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
 2015-02-24 16:59:04 +00:00
Sebastiaan van Stijn
681182ea7a Re-order maintainers 
Because they should be ordered alphabetically.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-02-24 17:49:03 +01:00