diff --git a/docs/s3_website.json b/docs/s3_website.json index 490c492ea4..1142fc0d87 100644 --- a/docs/s3_website.json +++ b/docs/s3_website.json @@ -17,6 +17,9 @@ { "Condition": { "KeyPrefixEquals": "docker-hub/invite.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/invite.png" } }, { "Condition": { "KeyPrefixEquals": "docker-hub/orgs.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/orgs.png" } }, { "Condition": { "KeyPrefixEquals": "docker-hub/repos.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/repos.png" } }, + { "Condition": { "KeyPrefixEquals": "installation/images/linux_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/linux_docker_host.svg" } }, + { "Condition": { "KeyPrefixEquals": "installation/images/osx_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/osx_docker_host.svg" } }, + { "Condition": { "KeyPrefixEquals": "installation/images/win_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/win_docker_host.svg" } }, { "Condition": { "KeyPrefixEquals": "examples/hello_world/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerizing/" } }, { "Condition": { "KeyPrefixEquals": "examples/python_web_app/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerizing/" } }, { "Condition": { "KeyPrefixEquals": "use/working_with_volumes/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockervolumes/" } }, diff --git a/docs/sources/article-img/architecture.svg b/docs/sources/article-img/architecture.svg index 607cc3c18f..afe563ae83 100644 --- a/docs/sources/article-img/architecture.svg +++ b/docs/sources/article-img/architecture.svg @@ -1,3 +1,2597 @@ - - -2014-04-15 00:37ZCanvas 1Layer 1HostContainer 1Container 2Container 3Container ...Docker Clientdocker pulldocker rundocker ...Docker IndexDocker Daemon + + + + + 2014-04-15 00:37Z + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/sources/installation/images/linux_docker_host.png b/docs/sources/installation/images/linux_docker_host.png deleted file mode 100644 index 42895c2f76..0000000000 Binary files a/docs/sources/installation/images/linux_docker_host.png and /dev/null differ diff --git a/docs/sources/installation/images/linux_docker_host.svg b/docs/sources/installation/images/linux_docker_host.svg new file mode 100644 index 0000000000..0ad7240b7a --- /dev/null +++ b/docs/sources/installation/images/linux_docker_host.svg @@ -0,0 +1,1195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/sources/installation/images/mac_docker_host.png b/docs/sources/installation/images/mac_docker_host.png deleted file mode 100644 index 9aa71a4ebc..0000000000 Binary files a/docs/sources/installation/images/mac_docker_host.png and /dev/null differ diff --git a/docs/sources/installation/images/mac_docker_host.svg b/docs/sources/installation/images/mac_docker_host.svg new file mode 100644 index 0000000000..a885a32cbe --- /dev/null +++ b/docs/sources/installation/images/mac_docker_host.svg @@ -0,0 +1,1243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/sources/installation/images/win_docker_host.svg b/docs/sources/installation/images/win_docker_host.svg new file mode 100644 index 0000000000..eef284e754 --- /dev/null +++ b/docs/sources/installation/images/win_docker_host.svg @@ -0,0 +1,1259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index 9bf7632680..9326f5fc47 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -42,12 +42,12 @@ containers run directly on your localhost. This means you can address ports on a Docker container using standard localhost addressing such as `localhost:8000` or `0.0.0.0:8376`. -![Linux Architecture Diagram](/installation/images/linux_docker_host.png) +![Linux Architecture Diagram](/installation/images/linux_docker_host.svg) In an OS X installation, the `docker` daemon is running inside a Linux virtual machine provided by Boot2Docker. -![OSX Architecture Diagram](/installation/images/mac_docker_host.png) +![OSX Architecture Diagram](/installation/images/mac_docker_host.svg) In OS X, the Docker host address is the address of the Linux VM. When you start the `boot2docker` process, the VM is assigned an IP address. Under @@ -324,4 +324,4 @@ at [Boot2Docker repository](https://github.com/boot2docker/boot2docker). Thanks to Chris Jones whose [blog](http://goo.gl/Be6cCk) inspired me to redo this page. -Continue with the [Docker User Guide](/userguide/). \ No newline at end of file +Continue with the [Docker User Guide](/userguide/). diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 95f55afebd..a1bd1de1d2 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -20,6 +20,8 @@ Although you will be using Windows Docker client, the docker engine hosting the containers will still be running on Linux. Until the Docker engine for Windows is developed, you can launch only Linux containers from your Windows machine. +![Windows Architecture Diagram](/installation/images/win_docker_host.svg) + ## Demonstration