From 529645209e1506fe280e131cb130c7e07f506061 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Wed, 18 Nov 2015 20:35:34 -0800 Subject: [PATCH] Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater modified note to provide a link for installation instructions on Ubuntu 15.04 or above cleaned up typos for ubuntulinux.md Signed-off-by: Zuhayr Elahi Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52 Component: engine --- components/engine/docs/installation/ubuntulinux.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/engine/docs/installation/ubuntulinux.md b/components/engine/docs/installation/ubuntulinux.md index d66f392882..c1d3448575 100644 --- a/components/engine/docs/installation/ubuntulinux.md +++ b/components/engine/docs/installation/ubuntulinux.md @@ -349,6 +349,11 @@ To avoid this warning, you can specify a DNS server for use by Docker containers. Or, you can disable `dnsmasq` in NetworkManager. Though, disabling `dnsmasq` might make DNS resolution slower on some networks. +The instructions below describe how to configure the Docker daemon running on +Ubuntu 14.10 or below. Ubuntu 15.04 and above use systemd as its boot +and service manager. Refer to [control and configure Docker with systemd](../articles/systemd.md#custom-docker-daemon-options) +to configure a daemon controled by systemd. + To specify a DNS server for use by Docker: 1. Log into Ubuntu as a user with `sudo` privileges.