From e0792e7ece7a71da83c902a03654bda4797ab054 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 7 Dec 2014 18:40:12 -0800 Subject: [PATCH 1/2] docs: remove a trailing whitespace Signed-off-by: Brandon Philips --- docs/sources/articles/systemd.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sources/articles/systemd.md b/docs/sources/articles/systemd.md index 028185f8df..77bcfe4c7b 100644 --- a/docs/sources/articles/systemd.md +++ b/docs/sources/articles/systemd.md @@ -45,14 +45,14 @@ In this example, we'll assume that your `docker.services` file looks something l Documentation=http://docs.docker.com After=network.target docker.socket Requires=docker.socket - + [Service] Type=notify EnvironmentFile=-/etc/sysconfig/docker ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS LimitNOFILE=1048576 LimitNPROC=1048576 - + [Install] Also=docker.socket @@ -68,7 +68,7 @@ You can also set other environment variables in this file, for example, the This example overrides the default `docker.service` file. -If you are behind a HTTP proxy server, for example in corporate settings, +If you are behind a HTTP proxy server, for example in corporate settings, you will need to add this configuration in the Docker systemd service file. Copy file `/usr/lib/systemd/system/docker.service` to `/etc/systemd/system/docker/service`. @@ -85,7 +85,7 @@ proxying you can specify them via the `NO_PROXY` environment variable: Flush changes: $ sudo systemctl daemon-reload - + Restart Docker: $ sudo systemctl restart docker From 2d51d71561565987fc6a600234f2e2d15e0ecf31 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 7 Dec 2014 18:44:07 -0800 Subject: [PATCH 2/2] docs: use systemd drop-ins instead of copying Copying the entire docker service file isn't necessary to add an environment variable, instead use a drop-in configuration file. The nice side-effect is that the user gets any vendor updates to the docker.service file. Signed-off-by: Brandon Philips --- docs/sources/articles/systemd.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/sources/articles/systemd.md b/docs/sources/articles/systemd.md index 77bcfe4c7b..0f66cd79d2 100644 --- a/docs/sources/articles/systemd.md +++ b/docs/sources/articles/systemd.md @@ -71,10 +71,14 @@ This example overrides the default `docker.service` file. If you are behind a HTTP proxy server, for example in corporate settings, you will need to add this configuration in the Docker systemd service file. -Copy file `/usr/lib/systemd/system/docker.service` to `/etc/systemd/system/docker/service`. +First, create a systemd drop-in directory for the docker service: -Add the following to the `[Service]` section in the new file: + mkdir /etc/systemd/system/docker.service.d +Now create a file called `/etc/systemd/system/docker.service.d/http-proxy.conf` +that adds the `HTTP_PROXY` environment variable: + + [Service] Environment="HTTP_PROXY=http://proxy.example.com:80/" If you have internal Docker registries that you need to contact without