beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

I'm going to wish I didn't do this

Browse source 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
This commit is contained in:
SvenDowideit 2014-07-02 10:30:25 +10:00
parent 2c32c195d9
commit fa29b1f062
58 changed files with 126 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -17,7 +17,7 @@ This information will help us review and fix your issue faster.
For instructions on setting up your development environment, please
see our dedicated [dev environment setup
docs](http://docs.docker.io/en/latest/contributing/devenvironment/).
docs](http://docs.docker.com/contributing/devenvironment/).
## Contribution guidelines
@ -190,7 +190,7 @@ There are several exceptions to the signing requirement. Currently these are:
* Your patch fixes Markdown formatting or syntax errors in the
documentation contained in the `docs` directory.
If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.io)
If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.com)
### How can I become a maintainer?

2
README.md
View file

@ -160,7 +160,7 @@ Docker can be used to run short-lived commands, long-running daemons
(app servers, databases etc.), interactive shell sessions, etc.
You can find a [list of real-world
examples](http://docs.docker.io/en/latest/examples/) in the
examples](http://docs.docker.com/examples/) in the
documentation.
Under the hood

2
contrib/completion/zsh/_docker
View file

@ -1,6 +1,6 @@
#compdef docker
#
# zsh completion for docker (http://docker.io)
# zsh completion for docker (http://docker.com)
#
# version: 0.2.2
# author: Felix Riedel

2
contrib/init/systemd/docker.service
View file

@ -1,6 +1,6 @@
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
Documentation=http://docs.docker.com
After=network.target
[Service]

2
contrib/init/systemd/socket-activation/docker.service
View file

@ -1,6 +1,6 @@
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
Documentation=http://docs.docker.com
After=network.target
[Service]

6
contrib/init/sysvinit-redhat/docker
View file

@ -2,10 +2,10 @@
#
# /etc/rc.d/init.d/docker
#
# Daemon for docker.io
# Daemon for docker.com
#
# chkconfig: 2345 95 95
# description: Daemon for docker.io
# description: Daemon for docker.com
### BEGIN INIT INFO
# Provides: docker
@ -16,7 +16,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: start and stop docker
# Description: Daemon for docker.io
# Description: Daemon for docker.com
### END INIT INFO
# Source function library.

2
daemon/daemon.go
View file

@ -836,7 +836,7 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
localCopy := path.Join(config.Root, "init", fmt.Sprintf("dockerinit-%s", dockerversion.VERSION))
sysInitPath := utils.DockerInitPath(localCopy)
if sysInitPath == "" {
return nil, fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See http://docs.docker.io/en/latest/contributing/devenvironment for official build instructions.")
return nil, fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See http://docs.docker.com/contributing/devenvironment for official build instructions.")
}
if sysInitPath != localCopy {

8
docs/README.md
View file

@ -3,7 +3,7 @@
The source for Docker documentation is here under `sources/` and uses extended
Markdown, as implemented by [MkDocs](http://mkdocs.org).
The HTML files are built and hosted on `https://docs.docker.io`, and update
The HTML files are built and hosted on `https://docs.docker.com`, and update
automatically after each change to the master or release branch of [Docker on
GitHub](https://github.com/dotcloud/docker) thanks to post-commit hooks. The
`docs` branch maps to the "latest" documentation and the `master` (unreleased
@ -21,14 +21,14 @@ In the rare case where your change is not forward-compatible, you may need to
base your changes on the `docs` branch.
Also, now that we have a `docs` branch, we can keep the
[http://docs.docker.io](http://docs.docker.io) docs up to date with any bugs
[http://docs.docker.com](http://docs.docker.com) docs up to date with any bugs
found between Docker code releases.
**Warning**: When *reading* the docs, the
[http://beta-docs.docker.io](http://beta-docs.docker.io) documentation may
[http://docs-stage.docker.com](http://docs-stage.docker.com) documentation may
include features not yet part of any official Docker release. The `beta-docs`
site should be used only for understanding bleeding-edge development and
`docs.docker.io` (which points to the `docs` branch`) should be used for the
`docs.docker.com` (which points to the `docs` branch`) should be used for the
latest official release.
## Contributing

2
docs/man/Dockerfile.5.md
View file

@ -203,4 +203,4 @@ or
run later, during the next build stage.
# HISTORY
*May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.io Dockerfile documentation.
*May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.com Dockerfile documentation.

2
docs/man/README.md
View file

@ -68,4 +68,4 @@ The Pandoc Docker container will process the Markdown files and generate
the man pages inside the `docker/docs/man/man1` directory using
Docker volumes. For more information on Docker volumes see the man page for
`docker run` and also look at the article [Sharing Directories via Volumes]
(http://docs.docker.io/use/working_with_volumes/).
(http://docs.docker.com/use/working_with_volumes/).

2
docs/man/docker-attach.1.md
View file

@ -57,5 +57,5 @@ attach** command:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-build.1.md
View file

@ -117,5 +117,5 @@ Note: You can set an arbitrary Git repository via the `git://` schema.
# HISTORY
March 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-commit.1.md
View file

@ -35,5 +35,5 @@ create a new image run docker ps to find the container's ID and then run:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and in
based on docker.com source material and in
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-cp.1.md
View file

@ -24,5 +24,5 @@ the exited container to the current dir on the host:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-diff.1.md
View file

@ -43,5 +43,5 @@ Inspect the changes to on a nginx container:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-events.1.md
View file

@ -49,5 +49,5 @@ Again the output container IDs have been shortened for the purposes of this docu
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-export.1.md
View file

@ -26,5 +26,5 @@ called test.tar:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-history.1.md
View file

@ -30,5 +30,5 @@ Show the history of when and how an image was created.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-images.1.md
View file

@ -86,5 +86,5 @@ tools.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-import.1.md
View file

@ -39,5 +39,5 @@ Import to docker via pipe and stdin:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-info.1.md
View file

@ -44,5 +44,5 @@ Here is a sample output:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-inspect.1.md
View file

@ -225,5 +225,5 @@ Use an image's ID or name (e.g., repository/name[:tag]) to get information
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-kill.1.md
View file

@ -20,5 +20,5 @@ The main process inside each container specified will be sent SIGKILL,
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-load.1.md
View file

@ -34,5 +34,5 @@ Restores both images and tags.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-login.1.md
View file

@ -34,5 +34,5 @@ login to a private registry you can specify this by adding the server name.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-logs.1.md
View file

@ -29,5 +29,5 @@ then continue streaming new output from the container’s stdout and stderr.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

1
docs/man/docker-port.1.md
View file

@ -13,5 +13,4 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

2
docs/man/docker-ps.1.md
View file

@ -66,5 +66,5 @@ the running containers.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.io source material and internal work.
based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

5
docs/man/docker-pull.1.md
View file

@ -51,5 +51,10 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

8
docs/man/docker-push.1.md
View file

@ -10,7 +10,7 @@ NAME[:TAG]
# DESCRIPTION
Push an image or a repository to a registry. The default registry is the Docker
Index located at [index.docker.io](https://index.docker.io/v1/). However the
Hub located at [hub.docker.com](https://hub.docker.com/). However the
image can be pushed to another, perhaps private, registry as demonstrated in
the example below.
@ -28,7 +28,7 @@ and then committing it to a new image name:
Now push the image to the registry using the image ID. In this example
the registry is on host named registry-host and listening on port 5000.
Default Docker commands will push to the default `index.docker.io`
Default Docker commands will push to the default `hub.docker.com`
registry. Instead, push to the local registry, which is on a host called
registry-host*. To do this, tag the image with the host name or IP
address, and the port of the registry:
@ -45,5 +45,9 @@ listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

5
docs/man/docker-restart.1.md
View file

@ -18,5 +18,10 @@ Restart each container listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-rm.1.md
View file

@ -47,5 +47,9 @@ command. The use that name as follows:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-rmi.1.md
View file

@ -34,5 +34,9 @@ Here is an example of removing and image:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-run.1.md
View file

@ -369,5 +369,9 @@ changes will also be reflected on the host in /var/db.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

5
docs/man/docker-save.1.md
View file

@ -33,5 +33,10 @@ fedora image to a fedora-latest.tar:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-search.1.md
View file

@ -54,5 +54,9 @@ ranked 1 or higher:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-start.1.md
View file

@ -23,5 +23,9 @@ Start a stopped container.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-stop.1.md
View file

@ -19,5 +19,9 @@ Stop a running container (Send SIGTERM, and then SIGKILL after
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

4
docs/man/docker-tag.1.md
View file

@ -54,5 +54,9 @@ registry you must tag it with the registry hostname and port (if needed).
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

5
docs/man/docker-top.1.md
View file

@ -27,5 +27,10 @@ Run **docker top** with the ps option of -x:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

5
docs/man/docker-wait.1.md
View file

@ -24,5 +24,10 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this

2
docs/man/docker.1.md
View file

@ -190,4 +190,4 @@ For example:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com) based
on docker.io source material and internal work.
on docker.com source material and internal work.

2
docs/mkdocs.yml
View file

@ -1,5 +1,5 @@
site_name: Docker Documentation
#site_url: http://docs.docker.io/
#site_url: http://docs.docker.com/
site_url: /
site_description: Documentation for fast and lightweight Docker container based virtualization framework.
site_favicon: img/favicon.png

2
docs/release.sh
View file

@ -9,7 +9,7 @@ To publish the Docker documentation you need to set your access_key and secret_k
(with the keys in a [profile $AWS_S3_BUCKET] section - so you can have more than one set of keys in your file)
and set the AWS_S3_BUCKET env var to the name of your bucket.
make AWS_S3_BUCKET=beta-docs.docker.io docs-release
make AWS_S3_BUCKET=docs-stage.docker.com docs-release
will then push the documentation site to your s3 bucket.
EOF

4
docs/sources/articles/security.md
View file

@ -5,7 +5,7 @@ page_keywords: Docker, Docker documentation, security
# Docker Security
> *Adapted from* [Containers & Docker: How Secure are
> They?](http://blog.docker.io/2013/08/containers-docker-how-secure-are-they/)
> They?](http://blog.docker.com/2013/08/containers-docker-how-secure-are-they/)
There are three major areas to consider when reviewing Docker security:
@ -251,4 +251,4 @@ with Docker, since everything is provided by the kernel anyway.
For more context and especially for comparisons with VMs and other
container systems, please also see the [original blog post](
http://blog.docker.io/2013/08/containers-docker-how-secure-are-they/).
http://blog.docker.com/2013/08/containers-docker-how-secure-are-they/).

2
docs/sources/articles/using_supervisord.md
View file

@ -27,7 +27,7 @@ Let's start by creating a basic `Dockerfile` for our
new image.
FROM ubuntu:13.04
MAINTAINER examples@docker.io
MAINTAINER examples@docker.com
RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
RUN apt-get update
RUN apt-get upgrade -y

2
docs/sources/contributing/devenvironment.md
View file

@ -16,7 +16,7 @@ Docker's build environment itself is a Docker container, so the first
step is to install Docker on your system.
You can follow the [install instructions most relevant to your
system](https://docs.docker.io/installation/). Make sure you
system](https://docs.docker.com/installation/). Make sure you
have a working, up-to-date docker installation, then continue to the
next step.

2
docs/sources/examples/postgresql_service.Dockerfile
View file

@ -1,5 +1,5 @@
#
# example Dockerfile for http://docs.docker.io/en/latest/examples/postgresql_service/
# example Dockerfile for http://docs.docker.com/examples/postgresql_service/
#
FROM ubuntu

2
docs/sources/examples/postgresql_service.md
View file

@ -21,7 +21,7 @@ Start by creating a new `Dockerfile`:
> suitably secure.
#
# example Dockerfile for http://docs.docker.io/examples/postgresql_service/
# example Dockerfile for http://docs.docker.com/examples/postgresql_service/
#
FROM ubuntu

4
docs/sources/faq.md
View file

@ -178,13 +178,13 @@ Cloud:
### How do I report a security issue with Docker?
You can learn about the project's security policy
[here](https://www.docker.io/security/) and report security issues to
[here](https://www.docker.com/security/) and report security issues to
this [mailbox](mailto:security@docker.com).
### Why do I need to sign my commits to Docker with the DCO?
Please read [our blog post](
http://blog.docker.io/2014/01/docker-code-contributions-require-developer-certificate-of-origin/)
http://blog.docker.com/2014/01/docker-code-contributions-require-developer-certificate-of-origin/)
on the introduction of the DCO.
### When building an image, should I prefer system libraries or bundled ones?

12
docs/sources/introduction/understanding-docker.md
View file

@ -112,7 +112,7 @@ Docker images are the **build** component of Docker.
#### Docker Registries
Docker registries hold images. These are public or private stores from which you upload
or download images. The public Docker registry is called
[Docker Hub](http://index.docker.io). It provides a huge collection of existing
[Docker Hub](http://hub.docker.com). It provides a huge collection of existing
images for your use. These can be images you create yourself or you
can use images that others have previously created. Docker registries are the
**distribution** component of Docker.
@ -156,7 +156,7 @@ basis for a new image, for example if you have a base Apache image you could use
this as the base of all your web application images.
> **Note:** Docker usually gets these base images from
> [Docker Hub](https://index.docker.io).
> [Docker Hub](https://hub.docker.com).
>
Docker images are then built from these base images using a simple, descriptive
set of steps we call *instructions*. Each instruction creates a new layer in our
@ -173,17 +173,17 @@ returns a final image.
### How does a Docker registry work?
The Docker registry is the store for your Docker images. Once you build a Docker
image you can *push* it to a public registry [Docker Hub](https://index.docker.io) or to
image you can *push* it to a public registry [Docker Hub](https://hub.docker.com) or to
your own registry running behind your firewall.
Using the Docker client, you can search for already published images and then
pull them down to your Docker host to build containers from them.
[Docker Hub](https://index.docker.io) provides both public and private storage
[Docker Hub](https://hub.docker.com) provides both public and private storage
for images. Public storage is searchable and can be downloaded by anyone.
Private storage is excluded from search results and only you and your users can
pull images down and use them to build containers. You can [sign up for a storage plan
here](https://index.docker.io/plans).
here](https://hub.docker.com/plans).
### How does a container work?
A container consists of an operating system, user-added files, and meta-data. As
@ -216,7 +216,7 @@ In order, Docker does the following:
- **Pulls the `ubuntu` image:** Docker checks for the presence of the `ubuntu`
image and, if it doesn't exist locally on the host, then Docker downloads it from
[Docker Hub](https://index.docker.io). If the image already exists, then Docker
[Docker Hub](https://hub.docker.com). If the image already exists, then Docker
uses it for the new container.
- **Creates a new container:** Once Docker has the image, it uses it to create a
container.

2
docs/sources/reference/run.md
View file

@ -240,7 +240,7 @@ to access to all devices on the host as well as set some configuration
in AppArmor to allow the container nearly all the same access to the
host as processes running outside containers on the host. Additional
information about running with `--privileged` is available on the
[Docker Blog](http://blog.docker.io/2013/09/docker-can-now-run-within-docker/).
[Docker Blog](http://blog.docker.com/2013/09/docker-can-now-run-within-docker/).
If the Docker daemon was started using the `lxc` exec-driver
(`docker -d --exec-driver=lxc`) then the operator can also specify LXC options

8
docs/sources/userguide/index.md
View file

@ -82,11 +82,11 @@ Go to [Working with Docker Hub](/userguide/dockerrepos).
## Getting help
* [Docker homepage](http://www.docker.io/)
* [Docker homepage](http://www.docker.com/)
* [Docker Hub](https://hub.docker.com)
* [Docker blog](http://blog.docker.io/)
* [Docker documentation](http://docs.docker.io/)
* [Docker Getting Started Guide](http://www.docker.io/gettingstarted/)
* [Docker blog](http://blog.docker.com/)
* [Docker documentation](http://docs.docker.com/)
* [Docker Getting Started Guide](http://www.docker.com/gettingstarted/)
* [Docker code on GitHub](https://github.com/dotcloud/docker)
* [Docker mailing
list](https://groups.google.com/forum/#!forum/docker-user)

2
docs/sources/userguide/usingdocker.md
View file

@ -19,7 +19,7 @@ In the process we learned about several Docker commands:
> **Tip:**
> Another way to learn about `docker` commands is our
> [interactive tutorial](https://www.docker.io/gettingstarted).
> [interactive tutorial](https://www.docker.com/tryit/).
The `docker` client is pretty simple. Each action you can take
with Docker is a command and each command can take a series of

2
docs/theme/mkdocs/css/main.css vendored
View file

@ -4,7 +4,7 @@
Core Docker style file
used on
www.docker.io
www.docker.com
docker-index
****************************** */
/* this is about 10% darker, but slightly different */

2
hack/dind
View file

@ -3,7 +3,7 @@ set -e
# DinD: a wrapper script which allows docker to be run inside a docker container.
# Original version by Jerome Petazzoni <jerome@dotcloud.com>
# See the blog post: http://blog.docker.io/2013/09/docker-can-now-run-within-docker/
# See the blog post: http://blog.docker.com/2013/09/docker-can-now-run-within-docker/
#
# This script should be executed inside a docker container in privilieged mode
# ('docker run --privileged', introduced in docker 0.6).

13
hack/infrastructure/README.md
View file

@ -20,7 +20,7 @@ AWS | packages (S3 bucket), dotCloud PAAS, dev-env, ci
CloudFlare | cdn
Digital Ocean | ci
dotCloud PAAS | website, index, registry, ssl, blog
DynECT | dns (docker.io)
DynECT | dns (docker.com)
GitHub | repository
Linode | stackbrew
Mailgun | outgoing e-mail
@ -36,20 +36,19 @@ and which service is handling them.
URL | Service
---------------------------------------------|---------------------------------
http://blog.docker.io/ | blog
http://blog.docker.com/ | blog
*http://cdn-registry-1.docker.io/ | registry (pull)
http://debug.docker.io/ | debug tool
http://docs.docker.io/ | docsproxy (proxy to readthedocs)
http://docs.docker.com/ | documentation served from an S3 bucket
http://docker-ci.dotcloud.com/ | ci
http://docker.io/ | redirect to www.docker.io (dynect)
http://docker.readthedocs.org/ | docs
http://docker.com/ | redirect to www.docker.com (dynect)
*http://get.docker.io/ | packages
https://github.com/dotcloud/docker | repository
*https://index.docker.io/ | index
*https://hub.docker.com/ | Docker Hub
http://registry-1.docker.io/ | registry (push)
http://staging-docker-ci.dotcloud.com/ | ci
*http://test.docker.io/ | packages
*http://www.docker.io/ | website
*http://www.docker.com/ | website
http://? (internal URL, not for public use) | stackbrew
*Ordered-by: lexicographic*

4
hack/make/ubuntu
View file

@ -8,8 +8,8 @@ if [ -n "$(git status --porcelain)" ]; then
fi
PACKAGE_ARCHITECTURE="$(dpkg-architecture -qDEB_HOST_ARCH)"
PACKAGE_URL="http://www.docker.io/"
PACKAGE_MAINTAINER="docker@dotcloud.com"
PACKAGE_URL="http://www.docker.com/"
PACKAGE_MAINTAINER="support@docker.com"
PACKAGE_DESCRIPTION="Linux container runtime
Docker complements LXC with a high-level API which operates at the process
level. It runs unix processes with strong guarantees of isolation and