[docker-io/f20: 2/2] Merge branch 'master' into f20
by Vincent Batts
commit a38ea803b7f25582a80af884dc103157b39dcd0f
Merge: 3b08451 cc30592
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Nov 25 08:15:24 2013 -0500
Merge branch 'master' into f20
docker-io.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
10 years, 5 months
[docker-io/el6: 2/2] update build time defines. thanks dan-fedora bz#1026545
by Vincent Batts
commit cc3059219da5b2f727c5c5feae97e6caf7bcfd1c
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Nov 25 08:13:17 2013 -0500
update build time defines. thanks dan-fedora
bz#1026545
docker-io.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 7425278..eaaec20 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -2,6 +2,9 @@
%bcond_without systemd
%endif
+# modifying the dockerinit binary breaks the SHA1 sum check by docker
+%global __os_install_post %{_rpmconfigdir}/brp-compress
+
#debuginfo not supported with Go
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
@@ -11,7 +14,7 @@
Name: docker-io
Version: 0.7
-Release: 0.19.rc7%{?dist}
+Release: 0.20.rc7%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -74,14 +77,14 @@ ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
export GOPATH=$(pwd):%{gopath}
# passing version information build flags BZ #1017186
export LDFLAGS="-X main.GITCOMMIT '%{shortcommit}/%{release}' -X main.VERSION '%{version}' -w"
-# tamper with their magic
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
export BUILDFLAGS="-tags netgo"
-go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS github.com/dotcloud/docker/docker
go build -v -a -ldflags \
"$LDFLAGS -linkmode external -extldflags '-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files' $LDFLAGS_STATIC" \
$BUILDFLAGS \
github.com/dotcloud/docker/dockerinit
+export DOCKER_INITSHA1="$(sha1sum dockerinit | cut -d' ' -f1)"
+go build -v -a -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS github.com/dotcloud/docker/docker
popd
@@ -153,6 +156,9 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Mon Nov 25 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.20.rc7
+- correct the build time defines (bz#1026545). Thanks dan-fedora.
+
* Fri Nov 22 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 0.7-0.19.rc7
- Remove xinetd entry, added sysvinit
10 years, 6 months
[Bug 1026045] New: enable container networking (temporary solution for dm branch)
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1026045
Bug ID: 1026045
Summary: enable container networking (temporary solution for dm
branch)
Product: Fedora
Version: rawhide
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: container networking doesn't work by default
Version-Release number of selected component (if applicable): docker-io 0.7.dm
How reproducible: iiuc, this occurs in the presence of a firewall (Matt,
correct me if I'm wrong)
Steps to Reproduce:
1. install docker-io, and enter a container
2. try any command which requires network connections (ping, yum, ssh)
3. feel the pain
Josh has a pull request against the master branch here:
https://github.com/dotcloud/docker/pull/2527 which is a little painful to apply
against dm, so I used the ACCEPT rules in his patch in the docker.service file,
so the current file looks like:
------------docker.service-------------------
[Unit]
Description=Docker container management daemon
[Service]
Type=simple
ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1
net.ipv6.conf.all.forwarding=1
ExecStartPre=iptables -I FORWARD -o docker0 -m conntrack --ctstate
RELATED,ESTABLISHED -j ACCEPT
ExecStartPre=iptables -l FORWARD -i docker0 ! -o docker0 -j ACCEPT
ExecStart=/usr/bin/docker -d
Restart=on-failure
[Install]
WantedBy=multi-user.target
------------docker.service-------------------
this seems to solve the problem for now, and if I'm not mistaken, isn't
harmful.
Comments?
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 6 months
[Bug 1028646] New: Error: json: cannot unmarshal number into Go value of type string
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1028646
Bug ID: 1028646
Summary: Error: json: cannot unmarshal number into Go value of
type string
Product: Fedora
Version: 20
Component: docker-io
Assignee: lsm5(a)redhat.com
Reporter: nath.e.will(a)gmail.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:
[root@wyrd ~]# docker search centos
2013/11/08 18:38:41 Error: json: cannot unmarshal number into Go value of type
string
[root@wyrd ~]# docker search base
2013/11/08 18:43:24 Error: json: cannot unmarshal number into Go value of type
string
Version-Release number of selected component (if applicable):
docker-io-0.7-0.13.dm.fc20.x86_64
How reproducible:
every time
Steps to Reproduce:
1. install docker-io-0.7-0.13.dm.fc20.x86_64
2. search for an image
Actual results:
Error: json: cannot unmarshal number into Go value of type string
Expected results:
list of available image
Additional info:
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 6 months
[docker-io/f20: 2/2] Merge branch 'master' into f20
by Lokesh Mandvekar
commit 3b0845142cc4edd5c0e09c167d001ba572139e7f
Merge: bf0e23c e3ff9ac
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Sat Nov 23 12:12:39 2013 -0600
Merge branch 'master' into f20
.gitignore | 1 +
docker-io.spec | 41 ++++++++++++------
docker.sysconfig | 1 +
docker.sysvinit | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
docker.xinetd | 11 -----
sources | 2 +-
6 files changed, 151 insertions(+), 26 deletions(-)
---
10 years, 6 months