[docker-io] udev rules added BZ 1034095
by Lokesh Mandvekar
commit ab27c4d7383a3c0ba484ff901dfbb7326fdafa0f
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 12:08:12 2013 -0600
udev rules added BZ 1034095
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
80-docker.rules | 2 ++
docker-io.spec | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/80-docker.rules b/80-docker.rules
new file mode 100644
index 0000000..cbf5471
--- /dev/null
+++ b/80-docker.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_IGNORE}="1"
+SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*", ENV{UDISKS_IGNORE}="1"
diff --git a/docker-io.spec b/docker-io.spec
index 8607b54..4cb0222 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -31,6 +31,7 @@ Source1: docker.service
# having .sysvinit and .sysconfig makes things clear
Source2: docker.sysconfig
Source3: docker.sysvinit
+Source4: 80-docker.rules
BuildRequires: gcc
BuildRequires: glibc-static
BuildRequires: golang(github.com/gorilla/mux)
@@ -51,7 +52,7 @@ Requires: lxc
Requires: tar
# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
# this won't be needed for rhel7+
-%if 0%{?rhel} <= 7
+%if 0%{?rhel} >= 6
Requires: bridge-utils
%endif
# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
@@ -76,8 +77,8 @@ rm -rf vendor
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
%patch2 -p1 -b brctl
-%patch3 -p1 -b docker-0.7.0-iptables-fix.patch
%endif
+%patch3 -p1 -b docker-0.7.0-iptables-fix.patch
%build
mkdir _build
@@ -115,6 +116,11 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
%endif
+# don't submit release 10 to epel until verified, only fedora for now
+%if 0%{?fedora} >= 19
+install -d %{buildroot}%{_sysconfdir}/udev/rules.d
+install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/udev/rules.d
+%endif
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -162,8 +168,16 @@ fi
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
%dir %{_sharedstatedir}/docker
+%if 0%{?fedora} >= 19
+%dir %{_sysconfdir}/udev/rules.d
+%{_sysconfdir}/udev/rules.d/80-docker.rules
+%endif
%changelog
+* Thu Nov 28 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-10
+- udev rules added for fedora >= 19 BZ 1034095
+- epel testing pending
+
* Thu Nov 28 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-9
- requires and started after firewalld
10 years, 4 months
[docker-io/el6: 4/4] Merge branch 'master' into el6
by Lokesh Mandvekar
commit 5a35ce777f7707b4e3a6235509047dcefab17169
Merge: a815094 c03fcad
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 03:32:15 2013 -0600
Merge branch 'master' into el6
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
Conflicts:
docker-io.spec
docker-0.7.0-iptables-fix.patch | 89 +++++++++++++++++++++++++++++++++++++++
docker-io.spec | 8 +++-
docker.service | 2 +
sources | 2 +-
4 files changed, 99 insertions(+), 2 deletions(-)
---
10 years, 4 months
[docker-io/el6] (4 commits) ...Merge branch 'master' into el6
by Lokesh Mandvekar
Summary of changes:
0a007fd... 0.7.0 patched with commit 0ff9bc1 (*)
0832c9e... iptables-fix.patch corrected (*)
c03fcad... 0.7.0-9 service requires firewalld (*)
5a35ce7... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
10 years, 4 months
[docker-io/f20: 2/2] Merge branch 'master' into f20
by Lokesh Mandvekar
commit 8f7798e7f904383ca7da3d8f5f849ee2b611d1c0
Merge: 0695de1 c03fcad
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 03:02:36 2013 -0600
Merge branch 'master' into f20
docker-io.spec | 5 ++++-
docker.service | 2 ++
2 files changed, 6 insertions(+), 1 deletions(-)
---
10 years, 4 months
[docker-io] 0.7.0-9 service requires firewalld
by Lokesh Mandvekar
commit c03fcad610a830cb56bfae0a6d99f1e3c114a1aa
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 02:55:52 2013 -0600
0.7.0-9 service requires firewalld
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 5 ++++-
docker.service | 2 ++
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index f590ef8..8607b54 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -164,6 +164,9 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Thu Nov 28 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-9
+- requires and started after firewalld
+
* Thu Nov 28 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-8
- iptables-fix patch corrected
diff --git a/docker.service b/docker.service
index 9882939..ac0e340 100644
--- a/docker.service
+++ b/docker.service
@@ -1,5 +1,7 @@
[Unit]
Description=Docker container management daemon
+Requires=firewalld.service
+After=firewalld.service
[Service]
Type=simple
10 years, 4 months
[docker-io/f20: 2/2] Merge branch 'master' into f20
by Lokesh Mandvekar
commit 0695de1b2139321a32f6bd2e7b20f2facbe32b2d
Merge: a5b1820 0832c9e
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 02:23:53 2013 -0600
Merge branch 'master' into f20
docker-0.7.0-iptables-fix.patch | 595 ++-------------------------------------
docker-io.spec | 5 +-
2 files changed, 23 insertions(+), 577 deletions(-)
---
10 years, 4 months