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

6307 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Rothfusz
c14c539c6c Merge pull request #4145 from SvenDowideit/redo-python-example 
touch up the examples
 2014-02-18 11:08:45 -08:00
Tianon Gravi
277262d9c7 Merge pull request #4205 from tianon/fix-dyntest 
Fix dyntest problems finding dockerinit
 2014-02-18 11:50:16 -07:00
Tianon Gravi
b10cfaef62 Merge pull request #4206 from tianon/ubuntu-conflicts 
Add "Conflicts" to our lxc-docker package
 2014-02-18 11:49:47 -07:00
Tianon Gravi
6d1c0a91f8 Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-18 11:24:33 -07:00
Tianon Gravi
6ccb30a0e5 Fix dyntest problems finding dockerinit 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-18 11:23:37 -07:00
Michael Crosby
6af6b72023 Merge pull request #4198 from alexlarsson/fix-setuid 
archive: Fix the storing of setuid bits, etc
 2014-02-18 13:11:32 -05:00
Alexander Larsson
5ba2462961 archive: Fix the storing of setuid bits, etc 
In commit 3dfc910d77 we changed from
syscall.Chmod() to os.Chmod(), but these take a different form of the
Mode argument. The sycall one takes the raw linux form, wheras
os.Chmod takes the os.FileMode form, and they differ for the higher
bits (setuid, setgid, etc). The raw tar header uses a form which
is compatible with the syscalls, but not the go calls.

We fix this by using hdr.FileInfo() which properly converts the mode
to what go expects.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-18 09:53:30 +01:00
James Turnbull
ef844adc3e Merge pull request #4196 from mahata/fixTypo 
Fix typo in 'Using Supervisor with Docker' example
 2014-02-17 22:48:54 -05:00
Yasunori Mahata
68de32888b Fix typo in 'Using Supervisor with Docker' example 
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com> (github: mahata)
 2014-02-17 19:43:56 -08:00
Sven Dowideit
29f7e1bfcb suggested improvements 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-18 13:23:28 +10:00
Sven Dowideit
b05602a0fe update a new movie: http://asciinema.org/a/7658 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-02-18 13:23:28 +10:00
Sven Dowideit
f535a58959 swap busybox for ubuntu, its quicker.. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-18 13:23:28 +10:00
Sven Dowideit
3036b5a196 rejig the helloflask example as more advanced, and move it to the end 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-18 13:23:28 +10:00
Michael Crosby
8f11a1a61f Merge pull request #4193 from creack/3964-add_tar-fix 
Fix remote tar ADD behavior
 2014-02-17 20:37:42 -05:00
Guillaume J. Charmes
98ce0cdb4f
Fix remote tar ADD behavior 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-17 17:08:17 -08:00
Guillaume J. Charmes
a3bc3bb8c3 Merge pull request #4159 from crosbymichael/move-volumes 
Move volumes out of container.go and into volumes.go
 2014-02-17 16:43:20 -08:00
Guillaume J. Charmes
e9db157bee Merge pull request #4162 from crosbymichael/movelinks 
Move links functionality into pkg
 2014-02-17 16:34:47 -08:00
Victor Vieux
4187f4e750 Merge pull request #4168 from crosbymichael/add-listenbuffer 
Hold connections until the daemon has fully loaded
 2014-02-17 16:04:49 -08:00
unclejack
045462a367 Merge pull request #4192 from crosbymichael/fix-404 
Fix error message only if no body is retuned
 2014-02-18 01:49:08 +02:00
Michael Crosby
e23190b6b3 Improve error message only if no body is returned 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:29:52 -08:00
Michael Crosby
d55cc64c4e Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message" 
This reverts commit 6dd1bb9eb0, reversing
changes made to 23aec9d7fc.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:25:00 -08:00
Michael Crosby
e743021193 Move job register into servapi 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:10:51 -08:00
Victor Vieux
518670f3d8 Merge pull request #4153 from crosbymichael/move-proxy 
Move proxy into pkg
 2014-02-17 14:51:16 -08:00
Victor Vieux
14ed82fc89 Merge pull request #4188 from unclejack/update_dns_resolver_warning 
update warning about local dns resolvers
 2014-02-17 14:39:59 -08:00
Andy Rothfusz
c7c825d9a5 Merge pull request #4171 from SvenDowideit/4061-remote-api-warning 
change the -H TCP / docker group warning to not reference a resolved issue
 2014-02-17 14:36:05 -08:00
unclejack
66c92140c9 Merge pull request #4155 from crosbymichael/remove-reflink 
Remove unused reflink files
 2014-02-18 00:29:35 +02:00
Michael Crosby
055f1a1f81 Remove verbose logging for non errors 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 13:31:13 -08:00
unclejack
85b8025a35 update warning about local dns resolvers 
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-17 23:29:36 +02:00
Victor Vieux
b7c2e8f54e Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco 
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
 2014-02-17 12:28:05 -08:00
Victor Vieux
8f140b2ded Merge pull request #4178 from alexlarsson/fix-aufs-plnk 
archive: Handle aufs plink hardlinks in ApplyLayer
 2014-02-17 11:48:39 -08:00
Alexander Larsson
6889cd9f9c archive: Handle aufs plink hardlinks in ApplyLayer 
Files in the .wh..wh.plnk directory are ignored, but other files
inside the tarfile can be hardlinks to these files. This is not
something that normally happens, as on aufs unmount such files are
supposed to be dropped via the "auplink" too, yet images on the index
(such as shipyard/shipyard, e.g. layer
f73c835af6d58b6fc827b400569f79a8f28e54f5bb732be063e1aacefbc374d0)
contains such files.

We handle these by extracting these files to a temporary directory
and resolve such hardlinks via the temporary files.

This fixes https://github.com/dotcloud/docker/issues/3884

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-17 20:46:32 +01:00
Victor Vieux
24498a896f Merge pull request #4187 from creack/fix_hostflag_panic 
Fix DOCKER_HOST=tcp:// panic
 2014-02-17 11:43:53 -08:00
Michael Crosby
2769d66f78 Merge pull request #4030 from TheDude05/fix-incorrect-ip-test 
Fix IPv4 Subnet Test
 2014-02-17 14:41:33 -05:00
Guillaume J. Charmes
513d864880
Fix DOCKER_HOST=tcp:// panic 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-17 11:35:26 -08:00
Guillaume J. Charmes
581ee7e584 Merge pull request #4186 from crosbymichael/netlink-maintainer 
Make crosbymichael and creack netlink maintainers
 2014-02-17 11:19:55 -08:00
Michael Crosby
a75c6907b4 Make crosbymichael and creack netlink maintainers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 11:17:05 -08:00
unclejack
f3ff190491 Merge pull request #4131 from tianon/vendor-golang-xattrs 
Add vendored archive/tar that includes xattrs patch
 2014-02-17 21:12:28 +02:00
Guillaume J. Charmes
19e44217f5 Merge pull request #4167 from shykes/fix-tests-mac 
Fix or document broken tests on mac
 2014-02-17 11:01:17 -08:00
Daniel Mizyrycki
f056a5d8c5 Merge pull request #4163 from mzdaniel/docker-ci 
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
 2014-02-17 18:56:32 +00:00
Tianon Gravi
032f45683b Merge pull request #4185 from tmc/fix-building-with-space 
Quote volume path in Makefile to allow spaces
 2014-02-17 11:53:41 -07:00
Michael Crosby
bc286d651d Merge pull request #4172 from fabiofalci/test_save_and_load 
Test for save and load commands
 2014-02-17 13:52:44 -05:00
Daniel Mizyrycki
b7db2d5f80 docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder. 
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
 2014-02-17 10:52:39 -08:00
Victor Vieux
382659e03a Merge pull request #4113 from SvenDowideit/build-quiet-help 
add a little reenforcement to the help for docker build -q
 2014-02-17 10:38:43 -08:00
Guillaume J. Charmes
a1fb3b5282 Merge pull request #3463 from songgao/patch-2 
Support submodules when building from a gh repo
 2014-02-17 10:28:17 -08:00
Travis Cline
5006509131 Quote volume path to allow spaces 
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
 2014-02-17 10:24:50 -08:00
Michael Crosby
1f66296c6e Merge pull request #4180 from alexlarsson/fix-restart-race 
Avoid temporarily unmounting the container when restarting it
 2014-02-17 13:21:53 -05:00
Song Gao
c9ae66ffe3
Support submodules when building from a gh repo 
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io> (github: songgao)
 2014-02-17 12:08:23 -06:00
unclejack
59e88b0967 Merge pull request #4164 from fabiofalci/cp_error_message 
`docker cp` error when container doesn't exist
 2014-02-17 19:13:55 +02:00
Tianon Gravi
b762d3a739 Add vendored archive/tar that includes xattrs patch 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-17 08:20:21 -07:00
James Turnbull
ab49015523 Merge pull request #4061 from mikemaccana/patch-1 
Add dockerode NodeJS implementation
 2014-02-17 10:14:17 -05:00