rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 679202 from home:mjura:branches:Virtualization:containers

Browse Source 
- 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
This commit is contained in:
Michal Jura 2019-02-26 12:18:18 +00:00 committed by Git OBS Bridge
parent 9189d5024b
commit 1080cf620d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 26 09:39:57 UTC 2019 - Michal Jura <mjura@suse.com>
- Move daemon.json file to /etc/docker directory, bsc#1114832
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 9 13:54:03 UTC 2019 - Aleksa Sarai <asarai@suse.com> Sat Feb 9 13:54:03 UTC 2019 - Aleksa Sarai <asarai@suse.com>

5
docker.spec
View File

@ -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 -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker
# install docker config file # 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 manpages (using the ones from the engine)
install -d %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man1
@ -451,7 +451,8 @@ getent group docker >/dev/null || groupadd -r docker
%dir %{_unitdir}/%{realname}.service.d/ %dir %{_unitdir}/%{realname}.service.d/
%{_unitdir}/%{realname}.service.d/90-kubic.conf %{_unitdir}/%{realname}.service.d/90-kubic.conf
%endif %endif
%config %{_sysconfdir}/daemon.json %dir %{_sysconfdir}/docker
%config %{_sysconfdir}/docker/daemon.json
%config %{_sysconfdir}/audit/rules.d/%{realname}.rules %config %{_sysconfdir}/audit/rules.d/%{realname}.rules
%{_udevrulesdir}/80-%{realname}.rules %{_udevrulesdir}/80-%{realname}.rules
%{_fillupdir}/sysconfig.docker %{_fillupdir}/sysconfig.docker