From 04ff70ab75006fa1578f901c663087fd36c8f017 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 14 Jul 2016 16:23:05 -0700 Subject: [PATCH 1/2] Enable docker socket and service on fedora Make sure that the users enable both the socket and service for docker as part of the default install instructions. If both are not enabled docker will not start at boot and restart containers. Signed-off-by: Michael Crosby Upstream-commit: 7a93a87c1a254abbf8e68093d4be241097694bb1 Component: engine --- .../engine/docs/installation/linux/fedora.md | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/components/engine/docs/installation/linux/fedora.md b/components/engine/docs/installation/linux/fedora.md index 12d1de77f7..33ad0740ff 100644 --- a/components/engine/docs/installation/linux/fedora.md +++ b/components/engine/docs/installation/linux/fedora.md @@ -60,11 +60,15 @@ There are two ways to install Docker Engine. You can install with the `dnf` pac $ sudo dnf install docker-engine -5. Start the Docker daemon. +5. Enable the socket and service. + + $ sudo systemctl enable docker.socket docker.service + +6. Start the Docker daemon. $ sudo systemctl start docker -6. Verify `docker` is installed correctly by running a test image in a container. +7. Verify `docker` is installed correctly by running a test image in a container. $ sudo docker run hello-world @@ -109,11 +113,15 @@ There are two ways to install Docker Engine. You can install with the `dnf` pac This script adds the `docker.repo` repository and installs Docker. -4. Start the Docker daemon. +4. Enable the socket and service. + + $ sudo systemctl enable docker.socket docker.service + +5. Start the Docker daemon. $ sudo systemctl start docker -5. Verify `docker` is installed correctly by running a test image in a container. +6. Verify `docker` is installed correctly by running a test image in a container. $ sudo docker run hello-world @@ -151,12 +159,6 @@ To create the `docker` group and add your user: $ docker run hello-world -## Start the docker daemon at boot - -To ensure Docker starts when you boot your system, do the following: - - $ sudo systemctl enable docker - If you need to add an HTTP Proxy, set a different directory or partition for the Docker runtime files, or make other customizations, read our Systemd article to learn how to [customize your Systemd Docker daemon options](../../admin/systemd.md). From a7897f14094166e647aa391d21fde04dfd7dddbb Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 14 Jul 2016 16:24:21 -0700 Subject: [PATCH 2/2] State that docker supports fedora 24 Signed-off-by: Michael Crosby Upstream-commit: 6780bdcbad3ab3b3de1568e51db676bb0f059cd8 Component: engine --- components/engine/docs/installation/linux/fedora.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/installation/linux/fedora.md b/components/engine/docs/installation/linux/fedora.md index 33ad0740ff..db60cde0c4 100644 --- a/components/engine/docs/installation/linux/fedora.md +++ b/components/engine/docs/installation/linux/fedora.md @@ -12,7 +12,7 @@ weight=-3 # Fedora -Docker is supported on Fedora version 22 and 23. This page instructs you to install +Docker is supported on Fedora version 22, 23, and 24. This page instructs you to install using Docker-managed release packages and installation mechanisms. Using these packages ensures you get the latest release of Docker. If you wish to install using Fedora-managed packages, consult your Fedora release documentation for