浏览代码

Add support for 15.04, add systemd note for 15.04

Fixes #12002

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Ankush Agarwal 10 年之前
父节点
当前提交
9847c0c8b0
共有 1 个文件被更改,包括 19 次插入0 次删除
  1. 19 0
      docs/installation/ubuntulinux.md

+ 19 - 0
docs/installation/ubuntulinux.md

@@ -12,6 +12,7 @@ parent = "smn_linux"
 
 
 Docker is supported on these Ubuntu operating systems:
 Docker is supported on these Ubuntu operating systems:
 
 
+- Ubuntu Vivid 15.04 
 - Ubuntu Trusty 14.04 (LTS) 
 - Ubuntu Trusty 14.04 (LTS) 
 - Ubuntu Precise 12.04 (LTS) 
 - Ubuntu Precise 12.04 (LTS) 
 - Ubuntu Saucy 13.10
 - Ubuntu Saucy 13.10
@@ -42,6 +43,10 @@ your kernel version:
 >version.
 >version.
 
 
 
 
+### For Vivid 15.04
+
+There are no prerequisites for this version.
+
 ### For Trusty 14.04
 ### For Trusty 14.04
 
 
 There are no prerequisites for this version.
 There are no prerequisites for this version.
@@ -143,6 +148,7 @@ better with Docker.
 * [Adjust memory and swap accounting](#adjust-memory-and-swap-accounting) 
 * [Adjust memory and swap accounting](#adjust-memory-and-swap-accounting) 
 * [Enable UFW forwarding](#enable-ufw-forwarding) 
 * [Enable UFW forwarding](#enable-ufw-forwarding) 
 * [Configure a DNS server for use by Docker](#configure-a-dns-server-for-docker)
 * [Configure a DNS server for use by Docker](#configure-a-dns-server-for-docker)
+* [Configure Docker to start on boot](#configure-docker-to-start-on-boot)
 
 
 ### Create a Docker group		
 ### Create a Docker group		
 
 
@@ -316,6 +322,19 @@ NetworkManager (this might slow your network).
 
 
         $ sudo restart network-manager $ sudo restart docker
         $ sudo restart network-manager $ sudo restart docker
 
 
+### Configure Docker to start on boot
+
+Ubuntu uses `systemd` as its boot and service manager `15.04` onwards and `upstart`
+for versions `14.10` and below.
+
+For `15.04` and up, to configure the `docker` daemon to start on boot, run
+
+    $ sudo systemctl enable docker
+
+&nbsp;
+
+For `14.10` and below the above installation method automatically configures `upstart`
+to start the docker daemon on boot
 
 
 ## Upgrade Docker
 ## Upgrade Docker