Browse code

Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation

[carry] configuring DNS options on systemd

moxiegirl authored on 2015/12/03 04:39:18
Showing 1 changed files
... ...
@@ -349,6 +349,12 @@ To avoid this warning, you can specify a DNS server for use by Docker
349 349
 containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabling
350 350
 `dnsmasq` might make DNS resolution slower on some networks.
351 351
 
352
+The instructions below describe how to configure the Docker daemon
353
+running on Ubuntu 14.10 or below. Ubuntu 15.04 and above use `systemd`
354
+as the boot and service manager. Refer to [control and configure Docker
355
+with systemd](../articles/systemd.md#custom-docker-daemon-options) to
356
+configure a daemon controlled by `systemd`.
357
+
352 358
 To specify a DNS server for use by Docker:
353 359
 
354 360
 1. Log into Ubuntu as a user with `sudo` privileges.