[docker-io] (14 commits) ...using commit 0ff9bc1 - initial package
by Lokesh Mandvekar
Summary of changes:
582ae2c... docker-io 0.7-rc6.17
3ae909c... README.md added
dbdf4b0... dockerinit explicitly listed in %files
bb91b21... description update in README.md
becfb5d... README.md description update
4819476... rc version bump
1e67a79... remove xinetd in favor of sysvinit
7e407b8... Merge branch 'master' into sysvinit
f787bc3... Merge pull request #1 from maxamillion/sysvinit
4806ef6... build times defines corrected
f2e61f5... v0.7.0-1
3267bf5... merged official git into github-master
31f2f71... bridge_flag patch and README.md removed
e4542db... using commit 0ff9bc1 - initial package
10 years, 4 months
[docker-io/f20: 3/4] Merge branch 'master' into f20
by Lokesh Mandvekar
commit ece2f5f4d54ad98962ed352052d66a47524b1c5c
Merge: 06435b5 38aab8d
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 16:04:42 2013 -0600
Merge branch 'master' into f20
docker-io.spec | 39 ++++++++++++++++++++++++++++++++++-----
docker-rhel-brctl.patch | 21 +++++++++++++++++++++
2 files changed, 55 insertions(+), 5 deletions(-)
---
10 years, 4 months
[docker-io] el6 preun postun changes
by Lokesh Mandvekar
commit 38aab8d406ab0fe77f4662e7ef2d323c53d5f20f
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 15:57:02 2013 -0600
el6 preun postun changes
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 0eea6c3..a82b023 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -42,8 +42,9 @@ BuildRequires: python-sphinxcontrib-httpdomain
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(postun): initscripts
%endif
Requires: lxc
Requires: tar
@@ -130,14 +131,18 @@ exit 0
%preun
%if %{with systemd}
%systemd_preun %{SOURCE1}
+%else
+/sbin/service docker stop >/dev/null 2>&1
+/sbin/chkconfig --del docker
%endif
%postun
%if %{with systemd}
%systemd_postun_with_restart %{SOURCE1}
%else
-%{_initrddir}/docker stop >/dev/null 2>&1
-/sbin/chkconfig --del docker
+if [ "$1" -ge "1" ] ; then
+ /sbin/service docker condrestart >/dev/null 2>&1 || :
+fi
%endif
%files
@@ -159,6 +164,9 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Wed Nov 27 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 0.7.0-5
+- Fix up EL6 preun/postun to not fail on postun scripts
+
* Wed Nov 27 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-4
- brctl patch for rhel <= 7
10 years, 4 months
[docker-io] brctl patch for less than rhel7
by Lokesh Mandvekar
commit 1d1c45e0b1b9ea7b1b49f376886d9583f87dd57a
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 15:23:27 2013 -0600
brctl patch for less than rhel7
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 6917aa8..0eea6c3 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -49,7 +49,8 @@ Requires: lxc
Requires: tar
# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
-%if 0%{?rhel} >= 6
+# this won't be needed for rhel7+
+%if 0%{?rhel} <= 7
Requires: bridge-utils
%endif
@@ -158,6 +159,9 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Wed Nov 27 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-4
+- brctl patch for rhel <= 7
+
* Wed Nov 27 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7.0-3
- Patch how the bridge network is set up on RHEL (BZ #1035436)
10 years, 4 months