diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2019-05-24 11:38:38 +0200 |
|---|---|---|
| committer | k.kedron <k.kedron@partner.samsung.com> | 2019-05-24 13:09:16 +0200 |
| commit | 5a180c4d5c0649b0b8a57782ef108f60e6049839 (patch) | |
| tree | 7a1751d5588f028ef61b2f8f1899b85cd0f78109 /lib | |
| parent | f0f1a644ee5c8da2ee35cb78b8db67e3838121cb (diff) | |
Add extra steps to properly configure docker in the OS which are based
on the systemd.
Issue-ID: INT-1090
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I840c7a4592a040e908cb599a51975d0ffa65b423
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/_installers | 10 | ||||
| -rw-r--r-- | lib/files/docker.conf | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/_installers b/lib/_installers index af1d3b1..29b819b 100755 --- a/lib/_installers +++ b/lib/_installers @@ -133,6 +133,15 @@ function _configure_docker_proxy { rm ${docker_conf_backup} } +function _configure_docker_systemd_service { + local docker_service=/etc/systemd/system/docker.service.d + + mkdir -p $docker_service + cp /var/onap/files/docker.conf $docker_service/docker.conf + + systemctl daemon-reload +} + # _configure_docker_settings() - Configures Docker settings function _configure_docker_settings { local docker_conf=/etc/default/docker @@ -148,6 +157,7 @@ function _configure_docker_settings { *suse) ;; ubuntu|debian) + _configure_docker_systemd_service service docker restart sleep 10 ;; diff --git a/lib/files/docker.conf b/lib/files/docker.conf new file mode 100644 index 0000000..d694797 --- /dev/null +++ b/lib/files/docker.conf @@ -0,0 +1,4 @@ +[Service] +EnvironmentFile=/etc/default/docker +ExecStart= +ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS |