From 1b302910cace9106dd54f69edb625048eafc9163 Mon Sep 17 00:00:00 2001 From: Stu Date: Wed, 27 Dec 2017 09:49:02 +1300 Subject: [PATCH] Update generic.md (#5610) add info about systemd setting --- machine/drivers/generic.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/machine/drivers/generic.md b/machine/drivers/generic.md index 62cf8b23310..f70c72426e6 100644 --- a/machine/drivers/generic.md +++ b/machine/drivers/generic.md @@ -15,9 +15,11 @@ The driver will perform a list of tasks on create: - If docker is not running on the host, it will be installed automatically. - It will update the host packages (`apt-get update`, `yum update`...). - It will generate certificates to secure the docker daemon. +- If the host uses systemd, it will create /etc/systemd/system/docker.service.d/10-machine.conf - The docker daemon will be restarted, thus all running containers will be stopped. - The hostname will be changed to fit the machine name. + ### Example To create a machine instance, specify `--driver generic`, the IP address or DNS @@ -56,4 +58,16 @@ as a sudoer with `NOPASSWD`. See https://help.ubuntu.com/community/Sudoers. | **`--generic-ip-address`** | `GENERIC_IP_ADDRESS` | - | | `--generic-ssh-key` | `GENERIC_SSH_KEY` | - | | `--generic-ssh-user` | `GENERIC_SSH_USER` | `root` | -| `--generic-ssh-port` | `GENERIC_SSH_PORT` | `22` | \ No newline at end of file +| `--generic-ssh-port` | `GENERIC_SSH_PORT` | `22` | + +### Systemd settings + +For systems that use systemd, if you have an existing configuration defined in +'/etc/systemd/system/docker.service.d/' this may conflict with the settings created by +docker-machine. Make sure you don't have any other configuration files in this location +that override the [ExecStart] setting. + +Once you have confirmed any conflicting settings have been removed, run +`sudo systemctl daemon reload` followed by `sudo systemctl restart docker` + +