[packages/docker] do not pre-create graph driver dir
glen
glen at pld-linux.org
Sat Jun 18 13:13:43 CEST 2016
commit e045cd134ec2c7bfc162835a7dede84423eae069
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jun 18 14:11:48 2016 +0300
do not pre-create graph driver dir
makes dockerd be confused when multiple found:
Error starting daemon: error initializing graphdriver: "/var/lib/docker" contains several valid graphdrivers: aufs, overlay; Please cleanup or explicitly choose storage driver (-s <DRIVER>)
docker.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/docker.spec b/docker.spec
index 3282c62..4f3ba7a 100644
--- a/docker.spec
+++ b/docker.spec
@@ -14,7 +14,7 @@
Summary: Docker: the open-source application container engine
Name: docker
Version: 1.11.2
-Release: 0.8
+Release: 0.9
License: Apache v2.0
Group: Applications/System
Source0: https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -144,7 +144,7 @@ man/md2man-all.sh
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man1,/etc/{rc.d/init.d,sysconfig},%{systemdunitdir}} \
$RPM_BUILD_ROOT%{_libexecdir} \
- $RPM_BUILD_ROOT/var/lib/docker/{aufs,containers,execdriver,graph,image,init,network,overlay,tmp,trust,vfs,volumes}
+ $RPM_BUILD_ROOT/var/lib/docker/{containers,execdriver,graph,image,init,network,tmp,trust,vfs,volumes}
install -p bundles/%{version}/dynbinary/docker-%{version} $RPM_BUILD_ROOT%{_bindir}/docker
@@ -215,14 +215,12 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(700,root,root) /var/lib/docker
-%dir %attr(700,root,root) /var/lib/docker/aufs
%dir %attr(700,root,root) /var/lib/docker/containers
%dir %attr(700,root,root) /var/lib/docker/execdriver
%dir %attr(700,root,root) /var/lib/docker/graph
%dir %attr(700,root,root) /var/lib/docker/image
%dir %attr(700,root,root) /var/lib/docker/init
%dir %attr(700,root,root) /var/lib/docker/network
-%dir %attr(700,root,root) /var/lib/docker/overlay
%dir %attr(700,root,root) /var/lib/docker/tmp
%dir %attr(700,root,root) /var/lib/docker/trust
%dir %attr(700,root,root) /var/lib/docker/vfs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docker.git/commitdiff/e045cd134ec2c7bfc162835a7dede84423eae069
More information about the pld-cvs-commit
mailing list