Djam/docker
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/docker.git synced 2025-02-23 17:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from rosaserver/docker:rosa2016.1

Browse source 
Some fix
This commit is contained in:
survolog 2019-08-15 06:40:54 +00:00
commit 7b33d61485
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docker.service
View file

@ -2,7 +2,6 @@
Description=Docker Application Container Engine Description=Docker Application Container Engine
Documentation=http://docs.docker.com Documentation=http://docs.docker.com
After=network.target After=network.target
Wants=docker-storage-setup.service
[Service] [Service]
Type=notify Type=notify

8
docker.spec
View file

@ -11,7 +11,7 @@
Summary: Automates deployment of containerized applications Summary: Automates deployment of containerized applications
Name: docker Name: docker
Version: 19.03.1 Version: 19.03.1
Release: 1 Release: 2
License: ASL 2.0 License: ASL 2.0
Group: System/Kernel and hardware Group: System/Kernel and hardware
Url: http://www.docker.com Url: http://www.docker.com
@ -77,10 +77,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%{_presetdir}/86-%{name}.preset %{_presetdir}/86-%{name}.preset
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket %{_unitdir}/%{name}.socket
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/%{name}.bash %{_sysconfdir}/bash_completion.d/%{name}.bash
%dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/lib/%{name}
%dir %{_udevrulesdir}
%{_udevrulesdir}/80-%{name}.rules %{_udevrulesdir}/80-%{name}.rules
%{_sysconfdir}/modules-load.d/overlay.conf %{_sysconfdir}/modules-load.d/overlay.conf
@ -205,7 +203,7 @@ install -p -m 755 libnetwork/proxy %{buildroot}%{_bindir}/%{name}-proxy
install -p -m 755 tini/build/tini-static %{buildroot}%{_bindir}/%{name}-init install -p -m 755 tini/build/tini-static %{buildroot}%{_bindir}/%{name}-init
# Place to store images # Place to store images
install -d %{buildroot}%{_var}/lib/%{name} install -d %{buildroot}%{_localstatedir}/lib/%{name}
# install bash completion # install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d install -d %{buildroot}%{_sysconfdir}/bash_completion.d
@ -230,7 +228,7 @@ install -p -m 644 components/cli/contrib/completion/zsh/_%{name} %{buildroot}%{_
install -d %{buildroot}%{_udevrulesdir} install -d %{buildroot}%{_udevrulesdir}
install -p -m 644 components/engine/contrib/udev/80-%{name}.rules %{buildroot}%{_udevrulesdir} install -p -m 644 components/engine/contrib/udev/80-%{name}.rules %{buildroot}%{_udevrulesdir}
# install storage dir # install storage dir
install -d -m 700 %{buildroot}%{_var}/lib/%{name} install -d -m 700 %{buildroot}%{_localstatedir}/lib/%{name}
# install systemd/init scripts # install systemd/init scripts
install -d %{buildroot}%{_unitdir} install -d %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{SOURCE7} %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE1} %{SOURCE7} %{buildroot}%{_unitdir}