1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

3441 commits

Author SHA1 Message Date
Alexander Larsson
8f7361279c Runtime: Add MountMethod to allow AUFS and device-mapper to coexist 2013-09-30 17:34:59 -06:00
Alexander Larsson
ca2f7f955e Runtime: Add DeviceSet singleton
This adds a DeviceSet singleton to the Runtime object which will be used for
any DeviceMapper dependent code.
2013-09-30 17:34:59 -06:00
Alexander Larsson
1d36b8c7b7 Server: Pass in device-mapper DeviceSet to server
This makes docker (but not docker-init) link to libdevmapper and will
allow it to use the DeviceSet
2013-09-30 17:34:59 -06:00
Alexander Larsson
e6216793d9 Add DeviceSet interface
This interface matches the device-mapper implementation (DeviceSetDM)
but is free from any dependencies. This allows core docker code
to refer to a DeviceSet without having an explicit dependency on
the devmapper package.

This is important, because the devmapper package has external
dependencies which are not wanted in the docker client app, as it
needs to run with minimal dependencies in the docker image.
2013-09-30 17:34:58 -06:00
Alexander Larsson
e368c8bb01 Image: Add runtime and container id args to Mount()
We will later need the runtime to get access to the VolumeSet
singleton, and the container id to have a name for the volume
for the container
2013-09-30 17:34:58 -06:00
Alexander Larsson
167601e858 Runtime: Automatically use docker-init if it exists
In some builds the main docker binary is not statically linked,
and as such not usable in as the .dockerinit binary, for those
cases we look for a separately shipped docker-init binary and
use that instead.
2013-09-30 17:34:58 -06:00
Alexander Larsson
b8dc7b5f1a Add a separate docker-init binary
This may be used for the .dockerinit case if the main binary is not
statically linked.
2013-09-30 17:34:58 -06:00
Alexander Larsson
7fb3bfed03 devmapper: Add simple tool to test the DeviceSet commands 2013-09-30 17:34:58 -06:00
Alexander Larsson
374a5e9913 devmapper: Add DeviceSet device-mapper helper
This is a module that uses the device-mapper create CoW snapshots
You instantiate a DeviceSetDM object on a specified root (/var/lib/docker),
and it will create a subdirectory there called "loopback". It will
contain two sparse files which are loopback mounted into
a thin-pool device-mapper device called "docker-pool".

We then create a base snapshot in the pool with an empty filesystem
which can be used as a base for docker snapshots. It also keeps track
of the mapping between docker image ids and the snapshots in the pool.

Typical use of is something like (without error checking):

devices = NewDeviceSetDM("/var/lib/docker")
devices.AddDevice(imageId, "") // "" is the base image id
devices.MountDevice(imageId, "/mnt/image")
 ... extract base image to /mnt/image
devices.AddDevice(containerId, imageId)
devices.MountDevice(containerId, "/mnt/container")
... start container at /mnt/container
2013-09-30 17:34:58 -06:00
Alexander Larsson
459bac7127 Add libdevmapper wrapper 2013-09-30 17:34:58 -06:00
Solomon Hykes
23015fa14d Merge pull request from metalivedev/1993-legalcontext
Fix : add explanation for export restrictions
2013-09-30 16:33:46 -07:00
Tianon Gravi
85b776995c Merge pull request from tianon/hack-dockerfile-refactor
Add cleanup/refactor portion of  for hack and Dockerfile updates
2013-09-30 16:29:32 -07:00
Thatcher
fa44555fb4 Merge pull request from dhrp/style-revamp
Changes to a new style for the docs. Includes version switcher.
2013-09-30 15:51:43 -07:00
Andy Rothfusz
3e7c50e8a1 Merge pull request from metalivedev/1969-cherrypick-fixcommitformat
Fix  formatting, add information about multiline json
2013-09-30 14:55:11 -07:00
Tianon Gravi
ccefe47897 Add cleanup/refactor portion of for hack and Dockerfile updates 2013-09-30 13:57:30 -06:00
Tianon Gravi
ff85031980 Merge pull request from tianon/mkimage-centos
Add contrib/mkimage-centos.sh back (from ), and associated documentation link
2013-09-30 10:51:06 -07:00
Guillaume J. Charmes
017ecefd66 Merge pull request from dotcloud/2030-dockercfg_panic_err-fix
- Runtime: fix panic with wrong dockercfg file
2013-09-30 10:02:12 -07:00
Victor Vieux
6496059154 fix panic with wrong dockercfg file 2013-09-30 11:07:32 +00:00
Victor Vieux
bcce3cbdd1 Merge pull request from dotcloud/fix_attach_2
Fix the attach behavior with -i
2013-09-30 03:29:19 -07:00
Victor Vieux
bbf644ed62 Merge pull request from dotcloud/2020_add_dockercfg_doc
add .dockercfg doc
2013-09-30 03:21:46 -07:00
Tianon Gravi
d89ce09a76 Add contrib/mkimage-centos.sh back (from ), and associated documentation link 2013-09-28 07:54:34 -06:00
Thatcher Peskens
e3e041b6bf Changes to a new style for the docs. Includes version switcher.
* added link to edit on GitHub
* Changed image source on homepage
* Made some changes to the structure, added the ability to have l3 navigation. Added warning, note and other styles.
* Fixed an image link, removed the .. :content: links because they were quicky and didn't look good, added pagelinks to current page of other versions.
* Moved the remote client api's to their own doc
2013-09-27 19:54:52 -07:00
Andy Rothfusz
0a35b1fb36 Added more context. 2013-09-27 19:07:12 -07:00
Andy Rothfusz
74d54b9b2e Fix formatting, add information about multiline json 2013-09-27 18:16:00 -07:00
Michael Crosby
31fd11860b Merge pull request from dotcloud/move-rm-to-client
Move run -rm to the cli only
2013-09-27 17:19:01 -07:00
Daniel Mizyrycki
b081a740b3 Merge pull request from jo-m/master
Enable SSH Agent forwarding in Vagrant VM
2013-09-27 12:07:44 -07:00
Michael Crosby
db869ecce5 Merge pull request from unclejack/479-add_rm_support_to_docker_run
Add -rm to docker run for removing a container on exit
2013-09-27 11:45:32 -07:00
Guillaume J. Charmes
537149829a
Fix the attach behavior with -i 2013-09-27 11:10:55 -07:00
Andy Rothfusz
ba10e28927 Merge pull request from kyleconroy/master
Improve registry and index REST API documentation
2013-09-27 10:56:21 -07:00
Victor Vieux
f4855a7cf0 add .dockercfg doc 2013-09-27 18:19:17 +02:00
unclejack
22e7e107ad automatically remove container via -rm
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm

This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
2013-09-27 17:43:12 +03:00
Guillaume J. Charmes
f435970695 Merge pull request from dotcloud/split_stdout_stderr
* Runtime: Split stdout stderr
2013-09-26 18:05:24 -07:00
Guillaume J. Charmes
cb18a6e1b9
Update docs + fix endian issue 2013-09-26 17:36:21 -07:00
Kyle Conroy
ce05083d4b Fix copypasta errors 2013-09-26 14:57:02 -07:00
Michael Crosby
723de87681 Move run -rm to the cli only 2013-09-26 14:52:37 -07:00
Kyle Conroy
818ec10da3 Fix Authorization headers 2013-09-26 01:19:49 -07:00
Kyle Conroy
34e28ccc88 Remove smart quotes. Add the X-Docker-Token header
Also fix the /layer endpoint, which had incorrect information
2013-09-26 01:15:36 -07:00
Kyle Conroy
792403f2dc Add the X-Docker-Registry header and /v1/_ping endpoint 2013-09-26 00:16:15 -07:00
Jonathan Mueller
8f5c33dc1f Enable SSH Agent forwarding in Vagrant VM, so one is able to clone repos from private git repos etc. 2013-09-25 22:57:04 +02:00
Andy Rothfusz
06c1f000e8 Merge pull request from tianon/deprecated-docker-latest-tgz
Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
2013-09-25 13:47:48 -07:00
Andy Rothfusz
00b3acb8ab Merge pull request from tianon/gentoo-tree
Update Gentoo installation documentation now that we're in the portage tree proper
2013-09-25 13:45:51 -07:00
Victor Vieux
420ba9c85a Merge pull request from kencochrane/master
fix the error message so it is the same as the regex issue 
2013-09-25 09:46:15 -07:00
Ken Cochrane
0f829bf5cf fix the error message so it is the same as the regex issue 2013-09-25 11:33:09 -04:00
Victor Vieux
1363de0934 Merge pull request from alexlarsson/setsid
Container: Always create a new session for the container
2013-09-25 07:40:51 -07:00
Tianon Gravi
d06116d2e8 Update Gentoo installation documentation now that we're in the portage tree proper
We're officially a first-class Gentoo citizen now, which is very exciting.  Many thanks to @gregkh for helping us get here.

I started just adapting sections of language in this document, and realized several bits needed to just be rewritten entirely to be more clear.
2013-09-24 23:26:36 -06:00
Tianon Gravi
595210a370 Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3 2013-09-24 21:25:45 -06:00
Michael Crosby
c9b916b293 Update VERSION to 0.6.3-dev 2013-09-24 19:54:13 -07:00
Michael Crosby
1e6370fd4b Merge branch 'release' 2013-09-24 19:54:06 -07:00
Solomon Hykes
a59a66528b Merge pull request from tianon/hack-build-instructions
* Hack: Add several of the small make.sh fixes from , and make the output more consistent and contributor-friendly
2013-09-24 17:38:39 -07:00
Andy Rothfusz
b048e9dffc Merge pull request from blissdev/patch-1
various command fixes in postgres example
2013-09-24 14:03:48 -07:00