diff --git a/docs/sources/terms/terms.rst b/docs/sources/terms/fundamentals.rst similarity index 82% rename from docs/sources/terms/terms.rst rename to docs/sources/terms/fundamentals.rst index bd957a2670..fed3decb08 100644 --- a/docs/sources/terms/terms.rst +++ b/docs/sources/terms/fundamentals.rst @@ -25,13 +25,13 @@ associate with Unix-like operating systems: ``/dev, /proc, /bin, /etc, and libraries required to run user applications (like bash, ls, and so forth). -While there can be important kernal differences between differnt Linux -distributions, the contents and organization of the root file system -are usually what make your software packages dependant on one +While there can be important kernal differences between different +Linux distributions, the contents and organization of the root file +system are usually what make your software packages dependent on one distribution versus another. Docker can help solve this problem by running multiple distributions at the same time. -.. image:: images/docker-filesystems-busyboxrw.png +.. image:: images/docker-filesystems-multiroot.png Layers and Union Mounts ======================= @@ -45,7 +45,7 @@ it takes advantage of a `union mount system *over* the read-only file system. In fact there may be multiple read-only file systems stacked on top of each other. -.. image:: images/docker-filesystems-debianrw.png +.. image:: images/docker-filesystems-multilayer.png At first, the top layer has nothing in it, but any time a process creates a file, this happens in the top layer. And if something needs @@ -60,11 +60,11 @@ a **union file system**. Image ===== -In Docker terminology, the read-only layer is called the -**image**. An image never changes. Because Docker uses a union file -system, the applications think the whole file system is mounted -read-write, because any file can be changed. But all the changes go to -the top-most layer, and underneath, the image is unchanged. Since they +In Docker terminology, a read-only layer is called an **image**. An +image never changes. Because Docker uses a union file system, the +applications think the whole file system is mounted read-write, +because any file can be changed. But all the changes go to the +top-most layer, and underneath, the image is unchanged. Since they don't change, images do not have state. Each image may depend on one more image which forms the layer beneath @@ -79,7 +79,7 @@ An image that has no parent is a **base image**. Container ========= -Once you start a Docker container from an image, Docker fetches the +Once you start a process in Docker from an image, Docker fetches the image and its parent, and repeats the process until it reaches the base image. Then the union file system adds a read-write layer on top. That read-write layer, plus the information about its parent and diff --git a/docs/sources/terms/images/docker-filesystems-multilayer.png b/docs/sources/terms/images/docker-filesystems-multilayer.png new file mode 100644 index 0000000000..2fdb236551 Binary files /dev/null and b/docs/sources/terms/images/docker-filesystems-multilayer.png differ diff --git a/docs/sources/terms/images/docker-filesystems-multiroot.png b/docs/sources/terms/images/docker-filesystems-multiroot.png new file mode 100644 index 0000000000..d575b3a4c1 Binary files /dev/null and b/docs/sources/terms/images/docker-filesystems-multiroot.png differ diff --git a/docs/sources/terms/images/docker-filesystems.svg b/docs/sources/terms/images/docker-filesystems.svg index 6c947f9186..c0e7b5ba12 100644 --- a/docs/sources/terms/images/docker-filesystems.svg +++ b/docs/sources/terms/images/docker-filesystems.svg @@ -14,8 +14,8 @@ id="svg2" height="600" width="800" - sodipodi:docname="docker-filesystems-06.svg" - inkscape:export-filename="/Users/arothfusz/Pictures/inkscape/docker-filesystems-06-busyboxrw.png" + sodipodi:docname="docker-filesystems.svg" + inkscape:export-filename="/Users/arothfusz/src/metalivedev/docker/docs/sources/terms/images/docker-filesystems-multilayer.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + id="guide3907" /> + id="guide4041" /> + id="guide4043" /> + id="guide4091" /> + id="guide4093" /> + id="guide4109" /> + id="guide4125" /> + id="guide4206" /> + id="guide4281" /> + id="guide9339" /> + + + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="1200.5884 : 584.76404 : 1" + inkscape:persp3d-origin="400.19492 : 199.86531 : 1" + id="perspective3054-6" /> @@ -118,927 +132,1214 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:groupmode="layer" + id="layer2" + inkscape:label="bootfs" + style="display:inline"> + d="M 132.72634,830.93804 386.05151,1004.3234 666.77808,819.25271 414.27662,735.0876 z" /> + d="m 132.72634,765.18707 0,65.75097 281.55028,-95.85044 0,-48.41204 z" /> + d="m 414.27662,686.67556 252.50146,69.2908 0,63.28635 -252.50146,-84.16511 z" /> + d="M 132.72634,765.18707 386.05151,907.74315 666.77808,755.96636 414.27662,686.67556 z" /> + d="m 386.05151,907.74315 0,96.58025 280.72657,-185.07069 0,-63.28635 z" /> + d="m 132.72634,765.18707 253.32517,142.55608 0,96.58025 -253.32517,-173.38536 z" /> + transform="matrix(0.58237543,0,0,0.58237543,219.84375,178.6359)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="text6476"> + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="path7409" + inkscape:connector-curvature="0" /> + transform="matrix(0.80267821,0,0,0.80267821,62.825218,56.880895)"> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + + + + + + + - - - - - - - + id="text10963"> + id="path10970" /> + id="path10972" /> + id="path10974" /> + id="path10976" /> + id="path10978" /> + id="path10980" /> + id="path10982" /> diff --git a/docs/sources/terms/index.rst b/docs/sources/terms/index.rst index d423b39f36..e46ba5b71a 100644 --- a/docs/sources/terms/index.rst +++ b/docs/sources/terms/index.rst @@ -14,5 +14,5 @@ Contents: .. toctree:: :maxdepth: 1 - terms + fundamentals