pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 712228 from home:cyphar:docker

Browse Source 
- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920

OBS-URL: https://build.opensuse.org/request/show/712228
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=311
This commit is contained in:
Aleksa Sarai 2019-06-27 07:16:12 +00:00 committed by Git OBS Bridge
parent d75af67d04
commit cc0b032b70
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 27 07:12:57 UTC 2019 - Aleksa Sarai <asarai@suse.com>
- Use %config(noreplace) for /etc/docker/daemon.json. bsc#1138920
-------------------------------------------------------------------
Fri Jun 7 08:36:17 UTC 2019 - Aleksa Sarai <asarai@suse.com>

10
docker.spec
View File

@ -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}