[docker-io/el6] 0.7-0.17.rc6
by Lokesh Mandvekar
Summary of changes:
ef21741... 0.7-0.17.rc6 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
[docker-io] 0.7-0.17.rc6
by Lokesh Mandvekar
commit ef21741639b136eb769351623342b4381b8127bf
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 21 17:26:34 2013 -0600
0.7-0.17.rc6
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
modified: docker-io.spec
modified: docker.service
modified: sources
dockerinit listed explicitly in %files
ExecStartPost lines in docker.service gotten rid of
(BZ #1026045)
docker-io.spec | 9 +++++++--
docker.service | 2 --
sources | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 5d77d1e..d04df3e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,7 +11,7 @@
Name: docker-io
Version: 0.7
-Release: 0.16.rc6%{?dist}
+Release: 0.17.rc6%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -133,7 +133,8 @@ fi
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%{_mandir}/man1/docker.1.gz
%{_bindir}/docker
-%{_libexecdir}/docker
+%dir %{_libexecdir}/docker
+%{_libexecdir}/docker/dockerinit
%if %{with systemd}
%{_unitdir}/docker.service
%else
@@ -145,6 +146,10 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Wed Nov 20 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.17.rc6
+- removed ExecStartPost lines from docker.service (BZ #1026045)
+- dockerinit listed in files
+
* Wed Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.16.rc6
- adding back the none bridge patch
diff --git a/docker.service b/docker.service
index b26d48d..9882939 100644
--- a/docker.service
+++ b/docker.service
@@ -5,8 +5,6 @@ Description=Docker container management daemon
Type=simple
ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1
ExecStart=/usr/bin/docker -d
-ExecStartPost=/usr/sbin/iptables -I FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-ExecStartPost=/usr/sbin/iptables -I FORWARD -i docker0 ! -o docker0 -j ACCEPT
Restart=on-failure
[Install]
diff --git a/sources b/sources
index 38ad2e9..673ead0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85d0c9ff7006d12b1f0a8019749e727e docker-9af7730.tar.gz
+8cbafc6b3bc89d2d86819a75cb1869ae docker-9af7730.tar.gz
10 years, 6 months
[Bug 1032884] New: failed to exec /.dockerinit
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1032884
Bug ID: 1032884
Summary: failed to exec /.dockerinit
Product: Fedora
Version: 19
Component: docker-io
Assignee: lsm5(a)redhat.com
Reporter: lsm5(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: golang(a)lists.fedoraproject.org, lsm5(a)redhat.com,
mattdm(a)redhat.com, mgoldman(a)redhat.com,
vbatts(a)redhat.com
Description of problem: failed to exec /.dockerinit
Version-Release number of selected component (if applicable): 0.7-0.16.rc6.fc19
How reproducible: always
Steps to Reproduce:
1. sudo docker run -i -t mattdm/fedora /bin/bash
Actual results:
$ sudo docker run -i -t mattdm/fedora /bin/bash
lxc-start: No such file or directory - failed to exec /.dockerinit
lxc-start: invalid sequence number 1. expected 2
lxc-start: failed to spawn
'c5f0ffe8ef04bfd12b135de49465251142cdf5da4886ad8ec1aa00da052974e7'
[error] commands.go:2203 Error resize: Error: bad file descriptor
Expected results: should enter container shell
Additional info: I noticed this only after 2330 CST on 11/20, the same version
was working fine before. Also been noticing something similar on my rawhide.
I hope it's just me :\ . Anyway, throwing it out there, will check later.
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 6 months
[golang/f19: 15/15] Merge branch 'master' into f19
by Vincent Batts
commit 80f4cc9e2217252e4ccb54f2c7a060dcf95c9011
Merge: e6ff519 8efa624
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 15:43:31 2013 -0500
Merge branch 'master' into f19
Conflicts:
golang.spec
golang-f21-hostname.patch | 13 ++++
golang.spec | 145 ++++++++++++++++++++++++++++++---------------
2 files changed, 111 insertions(+), 47 deletions(-)
---
diff --cc golang.spec
index 0c8030e,b5d46b5..6ecc0ea
--- a/golang.spec
+++ b/golang.spec
@@@ -271,11 -319,14 +319,14 @@@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_s
- Pull upstream patches for BZ#1010271
- Add glibc requirement that got dropped because of meta dep fix
- * Fri Aug 30 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-3
+ * Fri Aug 30 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-4
- fix the libc meta dependency (thanks to vbatts [at] redhat.com for the fix)
+ * Tue Aug 27 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-3
+ - Revert incorrect merged changelog
+
* Tue Aug 27 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-2
-- This was reverted, just a placeholder changelog entry for bad merge
+- Update spec to fix changelog entries from bad merge
* Tue Aug 20 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-1
- Update to latest upstream
10 years, 6 months
[golang/f19] (15 commits) ...Merge branch 'master' into f19
by Vincent Batts
Summary of changes:
3ea7b86... fix changelog in spec file for bad merge (*)
b054c12... Revert "fix changelog in spec file for bad merge" (*)
c2c1e2a... fix the "fix" that hit the wrong branch (*)
b77f3c2... fix meta dependency on libc (*)
5998fbd... EL6 edits (*)
b77f6c7... Revert "EL6 edits" (*)
355d9b0... fix for BZ#1010271 (*)
d8b5074... seperate the godoc into its own package again, but let it b (*)
7025cc8... formatting (*)
c91e9b6... accomdate the move of hostname command for rawhide (*)
d09407f... version bump (*)
ce418df... unify the spec to build on rhel and fedora (*)
6c39c37... vim-filesystem conditional for fedora (*)
8efa624... fixed the date (*)
80f4cc9... Merge branch 'master' into f19
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
[golang] (6 commits) ...fixed the date
by Vincent Batts
Summary of changes:
7025cc8... formatting (*)
c91e9b6... accomdate the move of hostname command for rawhide (*)
d09407f... version bump (*)
ce418df... unify the spec to build on rhel and fedora (*)
6c39c37... vim-filesystem conditional for fedora (*)
8efa624... fixed the date (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months
[golang/f20: 15/15] Merge branch 'master' into f20
by Vincent Batts
commit 6dfa9a88bcef910a68cbf2ef541110c53e276934
Merge: a601655 8efa624
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:46:08 2013 -0500
Merge branch 'master' into f20
Conflicts:
golang.spec
golang-f21-hostname.patch | 13 ++++
golang.spec | 147 ++++++++++++++++++++++++++++++--------------
2 files changed, 113 insertions(+), 47 deletions(-)
---
10 years, 6 months
[golang/f20] (15 commits) ...Merge branch 'master' into f20
by Vincent Batts
Summary of changes:
3ea7b86... fix changelog in spec file for bad merge (*)
b054c12... Revert "fix changelog in spec file for bad merge" (*)
c2c1e2a... fix the "fix" that hit the wrong branch (*)
b77f3c2... fix meta dependency on libc (*)
5998fbd... EL6 edits (*)
b77f6c7... Revert "EL6 edits" (*)
355d9b0... fix for BZ#1010271 (*)
d8b5074... seperate the godoc into its own package again, but let it b (*)
7025cc8... formatting (*)
c91e9b6... accomdate the move of hostname command for rawhide (*)
d09407f... version bump (*)
ce418df... unify the spec to build on rhel and fedora (*)
6c39c37... vim-filesystem conditional for fedora (*)
8efa624... fixed the date (*)
6dfa9a8... Merge branch 'master' into f20
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months