[docker-io: 1/2] using commit 0ff9bc1 for rpm
by Lokesh Mandvekar
commit 5dd9ab6f09bd21a58a99bd48988f86898ad94e06
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 00:44:02 2013 -0600
using commit 0ff9bc1 for rpm
sources | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/sources b/sources
index b0fdf17..5403ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc5e2aa1fbcd3ab8fac1a4f6a4613a16 v0.7.0.tar.gz
+768bb70b1e7401a4119ee9dc5165d7e0 docker-0ff9bc1.tar.gz
10 years, 4 months
[docker-io] merge master into f20
by Lokesh Mandvekar
commit 329c4d5baa9ee10c0ab8686cd463cf9cc6f49d05
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 00:44:02 2013 -0600
merge master into f20
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
sources | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/sources b/sources
index b0fdf17..5403ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc5e2aa1fbcd3ab8fac1a4f6a4613a16 v0.7.0.tar.gz
+768bb70b1e7401a4119ee9dc5165d7e0 docker-0ff9bc1.tar.gz
10 years, 4 months
[docker-io/f20: 15/15] Merge branch 'master' into f20
by Lokesh Mandvekar
commit ef0458a3d4b3eed4efef40fc433fc731df55d5bb
Merge: 962f852 e4542db
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 00:42:04 2013 -0600
Merge branch 'master' into f20
docker-io.spec | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
---
10 years, 4 months
[docker-io/f20] (15 commits) ...Merge branch 'master' into f20
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 (*)
ef0458a... Merge branch 'master' into f20
(*) This commit already existed in another branch; no separate mail sent
10 years, 4 months
[docker-io: 14/14] using commit 0ff9bc1 - initial package
by Lokesh Mandvekar
commit e4542dbf5b1ed10143aaa2097352538ce9c705b5
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Thu Nov 28 00:40:29 2013 -0600
using commit 0ff9bc1 - initial package
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 1ef50c0..fdd331c 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 0d078b65817fc91eba916652b3f087a6c2eef851
+%global commit 0ff9bc1be3ae044107732c605986a0af20220134
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
Version: 0.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -24,7 +24,7 @@ Patch2: docker-rhel-brctl.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
-Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
+Source0: https://github.com/goldmann/docker/archive/%{commit}/docker-%{shortcommit...
Source1: docker.service
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
@@ -69,7 +69,7 @@ and tests on a laptop will run at scale, in production*, on VMs, bare-metal
servers, OpenStack clusters, public instances, or combinations of the above.
%prep
-%setup -q -n docker-%{version}
+%setup -q -n docker-%{commit}
rm -rf vendor
%patch0 -p1 -b docker-0.7-remove-dotcloud-tar.patch
%if 0%{?rhel} >= 6
@@ -99,8 +99,8 @@ 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 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker
-install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
+install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev %{buildroot}%{_libexecdir}/docker/dockerinit
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
@@ -162,6 +162,10 @@ fi
%dir %{_sharedstatedir}/docker
%changelog
+* Thu Nov 28 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-6
+- using mgoldman's shortcommit value 0ff9bc1 for package (BZ #1033606)
+- https://github.com/dotcloud/docker/pull/2907
+
* 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
10 years, 4 months
[docker-io: 13/14] bridge_flag patch and README.md removed
by Lokesh Mandvekar
commit 31f2f7122e267345f7dd4e8b7a5eb42814c5a483
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 16:10:47 2013 -0600
bridge_flag patch and README.md removed
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
README.md | 3 ---
docker-bridge_flag.patch | 16 ----------------
2 files changed, 0 insertions(+), 19 deletions(-)
10 years, 4 months
[docker-io: 12/14] merged official git into github-master
by Lokesh Mandvekar
commit 3267bf518f060515511d665193ee773d4cd2fe15
Merge: f2e61f5 38aab8d
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 16:02:03 2013 -0600
merged official git into github-master
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
.gitignore | 1 +
docker-io.spec | 37 ++++++++++++++++++++++++++++++++-----
docker-rhel-brctl.patch | 21 +++++++++++++++++++++
sources | 1 +
4 files changed, 55 insertions(+), 5 deletions(-)
---
diff --cc docker-io.spec
index 48a9670,a82b023..1ef50c0
--- a/docker-io.spec
+++ b/docker-io.spec
@@@ -46,8 -48,18 +48,16 @@@ Requires(postun): initscript
%endif
Requires: lxc
Requires: tar
-
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1035436
+ # this won't be needed for rhel7+
+ %if 0%{?rhel} <= 7
+ Requires: bridge-utils
+ %endif
-
-Provides: lxc-docker = %{version}
-
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1034919
+ Requires: libcgroup
+
+Provides: lxc-docker = %{version}
+
%description
Docker is an open-source engine that automates the deployment of any
application as a lightweight, portable, self-sufficient container that will
10 years, 4 months
[docker-io: 11/14] v0.7.0-1
by Lokesh Mandvekar
commit f2e61f5cd900520e7bf2ba53116b5f621f5e8383
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 11:55:42 2013 -0600
v0.7.0-1
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index eaaec20..48a9670 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,22 +9,21 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit ea7811c83d913db91948cd4f696cf34b139da855
+%global commit 0d078b65817fc91eba916652b3f087a6c2eef851
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.7
-Release: 0.20.rc7%{?dist}
+Version: 0.7.0
+Release: 1%{?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
-Source0: https://github.com/crosbymichael/docker/archive/%{commit}/docker-%{shortc...
+Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
Source1: docker.service
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
@@ -60,33 +59,25 @@ and tests on a laptop will run at scale, in production*, on VMs, bare-metal
servers, OpenStack clusters, public instances, or combinations of the above.
%prep
-%setup -q -n docker-%{commit}
+%setup -q -n docker-%{version}
rm -rf vendor
%patch0 -p1 -b docker-0.7-remove-dotcloud-tar.patch
%if 0%{?rhel} >= 6
%patch1 -p1 -b docker-0.7-el6-docs.patch
%endif
-%patch2 -p1 -b none-bridge
%build
mkdir _build
+
pushd _build
+ mkdir -p src/github.com/dotcloud
+ ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+popd
-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"
-export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.IAMSTATIC true"
-export BUILDFLAGS="-tags netgo"
-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
+export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export GOPATH=$(pwd)/_build:%{gopath}
-popd
+hack/make.sh dynbinary
make -C docs/ man
@@ -97,8 +88,8 @@ 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}/docker
-install -p -m 755 _build/dockerinit %{buildroot}%{_libexecdir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
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
@@ -156,6 +147,10 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Tue Nov 26 2013 Marek Goldmann <mgoldman(a)redhat.com> - 0.7.0-1
+- Upstream release 0.7.0
+- Using upstream script to build the binary
+
* 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.
10 years, 4 months
[docker-io: 10/14] build times defines corrected
by Lokesh Mandvekar
commit 4806ef6542078e7321680299a745848b6634fc83
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Mon Nov 25 11:46:11 2013 -0600
build times defines corrected
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
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, 4 months