diff --git a/docker.changes b/docker.changes index 644445b..8bc77f9 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 27 07:12:57 UTC 2019 - Aleksa Sarai + +- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920 + ------------------------------------------------------------------- Fri Jun 7 08:36:17 UTC 2019 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index 394d9a4..859c099 100644 --- a/docker.spec +++ b/docker.spec @@ -469,17 +469,21 @@ getent group docker >/dev/null || groupadd -r docker %{_bindir}/docker %{_bindir}/dockerd %{_sbindir}/rcdocker +%dir %{_localstatedir}/lib/docker/ + %{_unitdir}/%{realname}.service %if "%flavour" == "kubic" %dir %{_unitdir}/%{realname}.service.d/ %{_unitdir}/%{realname}.service.d/90-kubic.conf %endif + %dir %{_sysconfdir}/docker -%config %{_sysconfdir}/docker/daemon.json +%config(noreplace) %{_sysconfdir}/docker/daemon.json +%{_fillupdir}/sysconfig.docker + %config %{_sysconfdir}/audit/rules.d/%{realname}.rules %{_udevrulesdir}/80-%{realname}.rules -%{_fillupdir}/sysconfig.docker -%dir %{_localstatedir}/lib/docker/ + %{_mandir}/man1/docker-*.1%{ext_man} %{_mandir}/man1/docker.1%{ext_man} %{_mandir}/man5/Dockerfile.5%{ext_man}