Browse Source

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

docs: use systemd drop-ins instead of copying
James Turnbull 10 năm trước cách đây
mục cha
commit
74b29e8b45
1 tập tin đã thay đổi với 10 bổ sung6 xóa
  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
     Documentation=http://docs.docker.com
     After=network.target docker.socket
     After=network.target docker.socket
     Requires=docker.socket
     Requires=docker.socket
-    
+
     [Service]
     [Service]
     Type=notify
     Type=notify
     EnvironmentFile=-/etc/sysconfig/docker
     EnvironmentFile=-/etc/sysconfig/docker
     ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS
     ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS
     LimitNOFILE=1048576
     LimitNOFILE=1048576
     LimitNPROC=1048576
     LimitNPROC=1048576
-    
+
     [Install]
     [Install]
     Also=docker.socket
     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.
 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.
 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/"
     Environment="HTTP_PROXY=http://proxy.example.com:80/"
 
 
 If you have internal Docker registries that you need to contact without
 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:
 Flush changes:
 
 
     $ sudo systemctl daemon-reload
     $ sudo systemctl daemon-reload
-    
+
 Restart Docker:
 Restart Docker:
 
 
     $ sudo systemctl restart docker
     $ sudo systemctl restart docker