Преглед изворни кода

Merge pull request #9559 from philips/use-dropins-in-systemd-article

docs: use systemd drop-ins instead of copying
James Turnbull пре 10 година
родитељ
комит
74b29e8b45
1 измењених фајлова са 10 додато и 6 уклоњено
  1. 10 6
      docs/sources/articles/systemd.md

+ 10 - 6
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,13 +68,17 @@ 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`.
+First, create a systemd drop-in directory for the docker service:
+
+    mkdir /etc/systemd/system/docker.service.d
 
-Add the following to the `[Service]` section in the new file:
+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
@@ -85,7 +89,7 @@ proxying you can specify them via the `NO_PROXY` environment variable:
 Flush changes:
 
     $ sudo systemctl daemon-reload
-    
+
 Restart Docker:
 
     $ sudo systemctl restart docker