[docker-io] update to 0.7.0-rc6
by Vincent Batts
commit 63a90d66410d8ec5dc747d849645c568a0fb7e77
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Nov 20 08:22:30 2013 -0500
update to 0.7.0-rc6
.gitignore | 1 +
docker-io.spec | 10 ++++++----
sources | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89e2502..2ae1e40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/docker-3c20a8c.tar.gz
/docker-1fe08e0.tar.gz
/docker-268e386.tar.gz
+/docker-9af7730.tar.gz
diff --git a/docker-io.spec b/docker-io.spec
index 36bc0f0..7b7c4df 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -6,18 +6,17 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 268e386f6626d6afdc414febc62bcc73be6ceec9
+%global commit 9af77302f476c3cef11bd4a1efe6b46f98abe781
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.7
-Release: 0.14.rc5%{?dist}
+Release: 0.15.rc6%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: docker-0.7-remove-dotcloud-tar.patch
Patch1: docker-0.7-el6-docs.patch
-Patch2: docker-bridge_flag.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -61,7 +60,6 @@ rm -rf vendor
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
%endif
-#%patch2 -p1
%build
mkdir _build
@@ -147,6 +145,10 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Wed Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.15.rc6
+- update docker source to crosbymichael/0.7.0-rc6
+- bridge-patch is not needed on this branch
+
* Tue Nov 19 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.14.rc5
- update docker source to crosbymichael/0.7-rc5
- update docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe
diff --git a/sources b/sources
index d903769..38ad2e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eab157d3a592551cb70574ae00bbf012 docker-268e386.tar.gz
+85d0c9ff7006d12b1f0a8019749e727e docker-9af7730.tar.gz
10 years, 5 months
[docker-io] new-sources
by Vincent Batts
commit 9be085b9d65fe9f2ae7dfd4198f0f54327493908
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Nov 20 07:39:41 2013 -0500
new-sources
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70db3fc..89e2502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/docker-0.7-rc3.zip
/docker-3c20a8c.tar.gz
/docker-1fe08e0.tar.gz
+/docker-268e386.tar.gz
10 years, 5 months
[docker-io] update to latest 0.7.0rc5 branch, and other build fixes too
by Vincent Batts
commit 9ea2e316d03a1a19d4ebdb5d468118f234b0c436
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Tue Nov 19 15:54:14 2013 -0500
update to latest 0.7.0rc5 branch, and other build fixes too
docker-io.spec | 22 ++++++++++++++++------
sources | 2 +-
2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index d95e3fb..36bc0f0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -6,7 +6,7 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 457375ea370a2da0df301d35b1aaa8f5964dabfe
+%global commit 268e386f6626d6afdc414febc62bcc73be6ceec9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
@@ -17,6 +17,7 @@ License: ASL 2.0
Patch0: docker-0.7-remove-dotcloud-tar.patch
Patch1: docker-0.7-el6-docs.patch
+Patch2: docker-bridge_flag.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -60,20 +61,27 @@ rm -rf vendor
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
%endif
+#%patch2 -p1
%build
mkdir _build
pushd _build
+echo $(pwd)
+
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
export GOPATH=$(pwd):%{gopath}
# passing version information build flags BZ #1017186
-LDFLAGS="-X main.GITCOMMIT %{shortcommit}/%{release} -X main.VERSION %{version} -w"
+export LDFLAGS="-X main.GITCOMMIT '%{shortcommit}/%{release}' -X main.VERSION '%{version}' -w"
# tamper with their magic
-LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
-go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" github.com/dotcloud/docker/docker
-go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" github.com/dotcloud/docker/dockerinit
+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
popd
@@ -139,10 +147,12 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
-* Mon Nov 18 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.14.rc5
+* Tue Nov 19 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.14.rc5
+- update docker source to crosbymichael/0.7-rc5
- update docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe
- static magic
- place dockerinit in a libexec
+- add sqlite dependency
* Sat Nov 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.13.dm
- docker.service file sets iptables rules to allow container networking, this
diff --git a/sources b/sources
index b380bb6..d903769 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-070b1dfadad579b1ca695786a0ea6289 docker-457375e.tar.gz
+eab157d3a592551cb70574ae00bbf012 docker-268e386.tar.gz
10 years, 5 months
[docker-io] put dockerinit where it is expected, and spoof their variables
by Vincent Batts
commit 260cc77b805283760bed7ceaa6eb80e216145926
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Nov 18 14:53:45 2013 -0500
put dockerinit where it is expected, and spoof their variables
docker-io.spec | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b92688d..d95e3fb 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -26,6 +26,7 @@ Source1: docker.service
# having .xinetd makes things clear
Source2: docker.xinetd
BuildRequires: gcc
+BuildRequires: glibc-static
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
@@ -68,9 +69,11 @@ mkdir -p src/github.com/dotcloud
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"
-go build -v -a -ldflags "$LDFLAGS" github.com/dotcloud/docker/docker
-go build -v -a -ldflags "$LDFLAGS" github.com/dotcloud/docker/docker-init
+LDFLAGS="-X main.GITCOMMIT %{shortcommit}/%{release} -X main.VERSION %{version} -w"
+# tamper with their magic
+LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
+go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" github.com/dotcloud/docker/docker
+go build -v -a -ldflags "$LDFLAGS $LDFLAGS_STATIC" github.com/dotcloud/docker/dockerinit
popd
@@ -78,12 +81,13 @@ make -C docs/ man
%install
install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_libexecdir}/docker
install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -d %{buildroot}%{_datadir}/zsh/site-functions
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-install -p -m 755 _build/docker %{buildroot}%{_bindir}
-install -p -m 755 _build/docker-init %{buildroot}%{_bindir}
+install -p -m 755 _build/docker %{buildroot}%{_bindir}/docker
+install -p -m 755 _build/dockerinit %{buildroot}%{_libexecdir}/docker
install -p -m 644 docs/_build/man/docker.1 %{buildroot}%{_mandir}/man1
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
install -p -m 644 contrib/completion/zsh/_docker %{buildroot}%{_datadir}/zsh/site-functions
@@ -123,7 +127,7 @@ fi
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%{_mandir}/man1/docker.1.gz
%{_bindir}/docker
-%{_bindir}/docker-init
+%{_libexecdir}/docker
%if %{with systemd}
%{_unitdir}/docker.service
%else
@@ -137,6 +141,8 @@ fi
%changelog
* Mon Nov 18 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.14.rc5
- update docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe
+- static magic
+- place dockerinit in a libexec
* Sat Nov 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.13.dm
- docker.service file sets iptables rules to allow container networking, this
10 years, 5 months
[docker-io] update the docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe their 0.7-rc5
by Vincent Batts
commit e46450827751b3307fc73c41375bceeb098ba4ee
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Mon Nov 18 11:33:45 2013 -0500
update the docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe
their 0.7-rc5
docker-io.spec | 8 ++++++--
sources | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index a43ad1a..b92688d 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -6,12 +6,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 1fe08e004686b25aaf56bc01194629c0b7e658f9
+%global commit 457375ea370a2da0df301d35b1aaa8f5964dabfe
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.7
-Release: 0.13.dm%{?dist}
+Release: 0.14.rc5%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -29,6 +29,7 @@ BuildRequires: gcc
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
BuildRequires: golang(code.google.com/p/go.net/websocket)
+BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: device-mapper-devel
BuildRequires: python-sphinxcontrib-httpdomain
%if %{with systemd}
@@ -134,6 +135,9 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Mon Nov 18 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7-0.14.rc5
+- update docker source to 457375ea370a2da0df301d35b1aaa8f5964dabfe
+
* Sat Nov 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.13.dm
- docker.service file sets iptables rules to allow container networking, this
is a stopgap approach, relevant pull request here:
diff --git a/sources b/sources
index 79e1d1c..b380bb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cdf369c927a18663046fa44f4480e739 docker-1fe08e0.tar.gz
+070b1dfadad579b1ca695786a0ea6289 docker-457375e.tar.gz
10 years, 5 months