From 1080cf620d2153b7e9ce59080d3dc75f2acabbc734892089ac169cc8c10fa13d Mon Sep 17 00:00:00 2001 From: Michal Jura Date: Tue, 26 Feb 2019 12:18:18 +0000 Subject: [PATCH] Accepting request 679202 from home:mjura:branches:Virtualization:containers - Move daemon.json file to /etc/docker directory, bsc#1114832 OBS-URL: https://build.opensuse.org/request/show/679202 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=288 --- docker.changes | 5 +++++ docker.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index 8db1c35..69c7031 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 26 09:39:57 UTC 2019 - Michal Jura + +- Move daemon.json file to /etc/docker directory, bsc#1114832 + ------------------------------------------------------------------- Sat Feb 9 13:54:03 UTC 2019 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index 0a6149c..669337c 100644 --- a/docker.spec +++ b/docker.spec @@ -392,7 +392,7 @@ install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{realnam install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker # install docker config file -install -D -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/daemon.json +install -D -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/docker/daemon.json # install manpages (using the ones from the engine) install -d %{buildroot}%{_mandir}/man1 @@ -451,7 +451,8 @@ getent group docker >/dev/null || groupadd -r docker %dir %{_unitdir}/%{realname}.service.d/ %{_unitdir}/%{realname}.service.d/90-kubic.conf %endif -%config %{_sysconfdir}/daemon.json +%dir %{_sysconfdir}/docker +%config %{_sysconfdir}/docker/daemon.json %config %{_sysconfdir}/audit/rules.d/%{realname}.rules %{_udevrulesdir}/80-%{realname}.rules %{_fillupdir}/sysconfig.docker