[docker-io/f20] enable selinux in build and unitfile
by Lokesh Mandvekar
commit 2271332831231316e3a8838504f0a93213e08b34
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 23:52:03 2014 -0400
enable selinux in build and unitfile
docker-io.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 6932902..1faa43e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,7 +10,7 @@
Name: docker-io
Version: 0.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -153,6 +153,9 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-3
+- keep NVR consistent with rawhide
+
* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
- get rid of conditionals
- enable selinux in build and unitfile
10 years
[docker-io/f20] enable selinux, get rid of conditionals
by Lokesh Mandvekar
commit e2d144318ba8731fbff408a3a1276c5b79876307
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 23:42:47 2014 -0400
enable selinux, get rid of conditionals
docker-0.9-el6-lxc.patch | 13 ---
docker-io.spec | 71 ++-----------
docker.service | 13 +++
ignore-btrfs-for-rhel.patch | 233 -------------------------------------------
4 files changed, 23 insertions(+), 307 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 17ffffd..6932902 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%bcond_without systemd
-%endif
-
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
@@ -14,18 +10,17 @@
Name: docker-io
Version: 0.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
-Patch0: ignore-btrfs-for-rhel.patch
Patch1: upstream-patched-archive-tar.patch
-Patch90: docker-0.9-el6-lxc.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
+Source1: docker.service
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
@@ -44,39 +39,19 @@ BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: device-mapper-devel
-# btrfs not available for rhel yet
-%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
-%endif
-%if %{with systemd}
BuildRequires: pkgconfig(systemd)
# Build upstream docs with pandoc
BuildRequires: pandoc
Requires: systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
-%endif
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
-# this won't be needed for rhel7+
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-Requires: bridge-utils
-Requires: lxc
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
-# No longer needed in Fedora because of libcontainer
-Requires: libcgroup
-%endif
-
Provides: lxc-docker = %{version}
%description
@@ -92,10 +67,6 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel}
-%patch0 -p1 -b ignore-btrfs-for-rhel
-%patch90 -p1 -b docker-0.9-el6-lxc
-%endif
%patch1 -p1 -b upstream-patched-archive-tar
%build
@@ -107,6 +78,7 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
@@ -140,45 +112,23 @@ install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/rules.d
# install storage dir
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
-# install systemd/init scripts
-%if %{with systemd}
+# install unitfile
install -d %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
-%else
-install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
-install -d %{buildroot}%{_initddir}
-install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
-%endif
+#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
%post
-%if %{with systemd}
%systemd_post docker
-%else
-# install but don't activate
-/sbin/chkconfig --add docker
-%endif
%preun
-%if %{with systemd}
%systemd_preun docker
-%else
-/sbin/service docker stop >/dev/null 2>&1
-/sbin/chkconfig --del docker
-%endif
%postun
-%if %{with systemd}
%systemd_postun_with_restart docker
-%else
-if [ "$1" -ge "1" ] ; then
- /sbin/service docker condrestart >/dev/null 2>&1 || :
-fi
-%endif
%files
%defattr(-,root,root,-)
@@ -188,12 +138,7 @@ fi
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
-%if %{with systemd}
%{_unitdir}/docker.service
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/docker
-%{_initddir}/docker
-%endif
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -208,6 +153,10 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
+- get rid of conditionals
+- enable selinux in build and unitfile
+
* Thu May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-1
- Bug 1095616 - upstream bump to 0.11.1
- manpages via pandoc
diff --git a/docker.service b/docker.service
new file mode 100644
index 0000000..1a63071
--- /dev/null
+++ b/docker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/docker -d --selinux-enabled
+Restart=on-failure
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+WantedBy=multi-user.target
10 years
[docker-io] enable selinux - 0.11.1-3
by Lokesh Mandvekar
commit 06cb169f75aad042975a62248a760d75548ab0d4
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 17:14:13 2014 -0400
enable selinux - 0.11.1-3
docker-io.spec | 11 +++++++++--
docker.service | 13 +++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 05deb7e..45732f9 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,7 +10,7 @@
Name: docker-io
Version: 0.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch0: ignore-btrfs-for-rhel.patch
@@ -19,6 +19,7 @@ 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
+Source1: docker.service
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
@@ -67,6 +68,7 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
@@ -102,7 +104,8 @@ install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/r
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
# install systemd/init scripts
install -d %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
+#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -140,6 +143,10 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-3
+- add selinux buildtag
+- enable selinux in unitfile
+
* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
- get rid of conditionals, separate out spec for each branch
diff --git a/docker.service b/docker.service
new file mode 100644
index 0000000..1a63071
--- /dev/null
+++ b/docker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/docker -d --selinux-enabled
+Restart=on-failure
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+WantedBy=multi-user.target
10 years
[docker-io] enable selinux in unitfile
by Lokesh Mandvekar
commit 6e18253a0fcd75005e9ef7446ebad489d3938a11
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 17:12:38 2014 -0400
enable selinux in unitfile
10 years
[docker-io] enable selinux
by Lokesh Mandvekar
commit a1fb823257ff075c5839a135833ed528f50508a3
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 17:11:33 2014 -0400
enable selinux
10 years
[docker-io] correct bogus date
by Lokesh Mandvekar
commit c343961fe044498bcf4fad2e218b89d020b8524d
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 10:14:16 2014 -0400
correct bogus date
docker-io.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 2229c43..05deb7e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -140,7 +140,7 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
-* Fri May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
+* Fri May 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
- get rid of conditionals, separate out spec for each branch
* Thu May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-1
10 years
[docker-io] v0.11.1
by Lokesh Mandvekar
commit b420d5bd261edff4804dcf4ab22ddc10d8670746
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Fri May 9 10:10:42 2014 -0400
v0.11.1
docker-io.spec | 162 +++++---------------
docker.service | 14 --
...s-for-rhel.patch => ignore-btrfs-for-rhel.patch | 42 +++---
remove-vendored-tar.patch | 108 -------------
sources | 3 +-
upstream-patched-archive-tar.patch | 108 +++++++++++++
6 files changed, 170 insertions(+), 267 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 489410d..2229c43 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%bcond_without systemd
-%endif
-
# modifying the dockerinit binary breaks the SHA1 sum check by docker
%global __os_install_post %{_rpmconfigdir}/brp-compress
@@ -9,26 +5,22 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 79993599658b4e8ed6764ffc07b6fc747e98cc1f
+%global commit fb99f992c081a1d433c97c99ffb46d12693eeb76
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.10.0
-Release: 4%{?dist}
+Version: 0.11.1
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
-
-Patch0: remove-vendored-tar.patch
-Patch1: remove-btrfs-for-rhel.patch
+Patch0: ignore-btrfs-for-rhel.patch
+Patch1: upstream-patched-archive-tar.patch
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
-#Current upstream https://github.com/lsm5/docker/tree/2014-05-01-2
-Source0: https://github.com/lsm5/docker/archive/%{commit}/docker-%{shortcommit}.ta...
+Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
-Source1: docker.service
-Source2: docker-man.tar.gz
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -36,33 +28,19 @@ BuildRequires: glibc-static
BuildRequires: golang >= 1.2-7
BuildRequires: golang(github.com/gorilla/mux)
BuildRequires: golang(github.com/kr/pty)
+BuildRequires: golang(github.com/godbus/dbus)
+BuildRequires: golang(github.com/coreos/go-systemd) >= 0-0.4
BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
-BuildRequires: golang(github.com/godbus/dbus)
-BuildRequires: golang(github.com/coreos/go-systemd/activation)
BuildRequires: device-mapper-devel
-# btrfs not available for rhel yet
-%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
-%endif
-%if %{with systemd}
BuildRequires: pkgconfig(systemd)
+BuildRequires: pandoc
Requires: systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(postun): initscripts
-%endif
# need xz to work with ubuntu images
# https://bugzilla.redhat.com/show_bug.cgi?id=1045220
Requires: xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1035436
-# this won't be needed for rhel7+
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-Requires: bridge-utils
-%endif
-
Provides: lxc-docker = %{version}
%description
@@ -76,13 +54,9 @@ 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 remove-vendored-tar
-%if 0%{?rhel}
-%patch1 -p1 -b remove-btrfs-for-rhel
-%endif
-tar zxf %{SOURCE2}
+%patch1 -p1 -b upstream-patched-archive-tar
%build
mkdir _build
@@ -93,23 +67,23 @@ pushd _build
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
-export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+contrib/man/md/md2man-all.sh
cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
cp contrib/syntax/vim/README.md README-vim-syntax.md
%install
# install binary
install -d %{buildroot}%{_bindir}
-install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker
# install dockerinit
install -d %{buildroot}%{_libexecdir}/docker
-install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev %{buildroot}%{_libexecdir}/docker/dockerinit
-# install manpages
+install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 man1/* %{buildroot}%{_mandir}/man1
+install -p -m 644 contrib/man/man1/docker*.1 %{buildroot}%{_mandir}/man1
# install bash completion
install -d %{buildroot}%{_sysconfdir}/bash_completion.d
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash_completion.d/docker.bash
@@ -127,61 +101,31 @@ install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/r
# install storage dir
install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
# install systemd/init scripts
-%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/socket-activation/docker.socket %{buildroot}%{_unitdir}
-%else
-install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/docker
-install -d %{buildroot}%{_initddir}
-install -p -m 755 contrib/init/sysvinit-redhat/docker %{buildroot}%{_initddir}/docker
-%endif
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
exit 0
%post
-%if %{with systemd}
%systemd_post docker
-%else
-# install but don't activate
-/sbin/chkconfig --add docker
-%endif
%preun
-%if %{with systemd}
%systemd_preun docker
-%else
-/sbin/service docker stop >/dev/null 2>&1
-/sbin/chkconfig --del docker
-%endif
%postun
-%if %{with systemd}
%systemd_postun_with_restart docker
-%else
-if [ "$1" -ge "1" ] ; then
- /sbin/service docker condrestart >/dev/null 2>&1 || :
-fi
-%endif
%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md
%doc LICENSE-vim-syntax README-vim-syntax.md
-%{_mandir}/man1/*
+%{_mandir}/man1/docker*.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
-%if %{with systemd}
%{_unitdir}/docker.service
-%{_unitdir}/docker.socket
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/docker
-%{_initddir}/docker
-%endif
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -196,63 +140,37 @@ fi
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
-* Thu May 01 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-4
-- enable selinux in unitfile
-
-* Thu May 01 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-3
-- branch https://github.com/lsm5/docker/commits/2014-05-01-2
-
-* Thu May 01 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
-- branch https://github.com/lsm5/docker/tree/2014-05-01
+* Fri May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-2
+- get rid of conditionals, separate out spec for each branch
-* Fri Apr 25 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
-- rebased on 0.10.0
-- branch used: https://github.com/lsm5/docker/tree/2014-04-25
-- manpages packaged separately (pandoc not available on RHEL-7)
+* Thu May 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.11.1-1
+- Bug 1095616 - upstream bump to 0.11.1
+- manpages via pandoc
-* Tue Apr 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-4.collider
-- manpages merged, some more patches from alex
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-2
+- regenerate btrfs removal patch
+- update commit value
-* Thu Apr 03 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-3.collider
-- fix --volumes-from mount failure, include docker-images/info/tag manpages
+* Mon Apr 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.10.0-1
+- include manpages from contrib
-* Tue Apr 01 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-2.collider
-- solve deadlock issue
+* Wed Apr 09 2014 Bobby Powers <bobbypowers(a)gmail.com> - 0.10.0-1
+- Upstream version bump
-* Mon Mar 31 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1.collider
-- branch 2014-03-28, include additional docker manpages from whenry
+* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.1-1
+- BZ 1080799 - upstream version bump
-* Thu Mar 27 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-7.collider
-- env file support (vbatts)
+* Thu Mar 13 2014 Adam Miller <maxamillion(a)fedoraproject.org> - 0.9.0-3
+- Add lxc requirement for EPEL6 and patch init script to use lxc driver
+- Remove tar dep, no longer needed
+- Require libcgroup only for EPEL6
-* Mon Mar 17 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-6.collider
-- dwalsh's selinux patch rewritten
-- point to my docker repo as source0 (contains all patches already)
-- don't require tar and libcgroup
-
-* Fri Mar 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-5.collider
-- add kraman's container-pid.patch
-
-* Fri Mar 14 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-4.collider
-- require docker.socket in unitfile
-
-* Thu Mar 13 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-3.collider
-- use systemd socket activation
-
-* Wed Mar 12 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-2.collider
-- add collider tag to release field
+* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-2
+- lxc removed (optional)
+ http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-an...
* Tue Mar 11 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.9.0-1
-- upstream version bump to 0.9.0
-
-* Mon Mar 10 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-3
-- add alexl's patches upto af9bb2e3d37fcddd5e041d6ae45055f649e2fbd4
-- add guelfey/go.dbus to BR
-
-* Sun Mar 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-2
-- use upstream commit 3ace9512bdf5c935a716ee1851d3e636e7962fac
-- add dwalsh's patches for selinux, emacs-gitignore, listen_pid and
-remount /var/lib/docker as --private
+- BZ 1074880 - upstream version bump to v0.9.0
* Wed Feb 19 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.8.1-1
- Bug 1066841 - upstream version bump to v0.8.1
diff --git a/remove-btrfs-for-rhel.patch b/ignore-btrfs-for-rhel.patch
similarity index 74%
rename from remove-btrfs-for-rhel.patch
rename to ignore-btrfs-for-rhel.patch
index 76c948b..5a14235 100644
--- a/remove-btrfs-for-rhel.patch
+++ b/ignore-btrfs-for-rhel.patch
@@ -1,15 +1,6 @@
-diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/daemon_btrfs.go docker-1/daemon/daemon_btrfs.go
---- docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/daemon_btrfs.go 2014-04-25 13:44:42.000000000 -0400
-+++ docker-1/daemon/daemon_btrfs.go 2014-04-25 15:58:46.895027946 -0400
-@@ -3,5 +3,4 @@
- package daemon
-
- import (
-- _ "github.com/dotcloud/docker/daemon/graphdriver/btrfs"
- )
-diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btrfs/btrfs.go docker-1/daemon/graphdriver/btrfs/btrfs.go
---- docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btrfs/btrfs.go 2014-04-25 13:44:42.000000000 -0400
-+++ docker-1/daemon/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/btrfs.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-// +build linux,amd64
-
@@ -24,7 +15,7 @@ diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btr
-
-import (
- "fmt"
-- "github.com/dotcloud/docker/daemon/graphdriver"
+- "github.com/dotcloud/docker/runtime/graphdriver"
- "os"
- "path"
- "syscall"
@@ -93,7 +84,7 @@ diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btr
- return uintptr(C.dirfd(dir))
-}
-
--func subvolCreate(path, name string) error {
+-func subvolCreate(path, name string, mountLabel string) error {
- dir, err := openDir(path)
- if err != nil {
- return err
@@ -168,17 +159,17 @@ diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btr
- return path.Join(d.subvolumesDir(), id)
-}
-
--func (d *Driver) Create(id string, parent string) error {
+-func (d *Driver) Create(id string, parent string, mountLabel string) error {
- subvolumes := path.Join(d.home, "subvolumes")
- if err := os.MkdirAll(subvolumes, 0700); err != nil {
- return err
- }
- if parent == "" {
-- if err := subvolCreate(subvolumes, id); err != nil {
+- if err := subvolCreate(subvolumes, id, mountLabel); err != nil {
- return err
- }
- } else {
-- parentDir, err := d.Get(parent, "")
+- parentDir, err := d.Get(parent)
- if err != nil {
- return err
- }
@@ -200,7 +191,7 @@ diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btr
- return os.RemoveAll(dir)
-}
-
--func (d *Driver) Get(id, mountLabel string) (string, error) {
+-func (d *Driver) Get(id string) (string, error) {
- dir := d.subvolumesDirId(id)
- st, err := os.Stat(dir)
- if err != nil {
@@ -224,10 +215,19 @@ diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btr
- _, err := os.Stat(dir)
- return err == nil
-}
-diff -uNr docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btrfs/dummy_unsupported.go docker-1/daemon/graphdriver/btrfs/dummy_unsupported.go
---- docker-a6e878a916ba2b281a82fe780fc129727b103555/daemon/graphdriver/btrfs/dummy_unsupported.go 2014-04-25 13:44:42.000000000 -0400
-+++ docker-1/daemon/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
+diff -uNr docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go
+--- docker-0.10.0/runtime/graphdriver/btrfs/dummy_unsupported.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/graphdriver/btrfs/dummy_unsupported.go 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-// +build !linux !amd64
-
-package btrfs
+diff -uNr docker-0.10.0/runtime/runtime_btrfs.go docker-0.10.0-1/runtime/runtime_btrfs.go
+--- docker-0.10.0/runtime/runtime_btrfs.go 2014-04-08 17:49:33.000000000 -0400
++++ docker-0.10.0-1/runtime/runtime_btrfs.go 2014-04-14 11:47:23.665041947 -0400
+@@ -3,5 +3,4 @@
+ package runtime
+
+ import (
+- _ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
+ )
diff --git a/sources b/sources
index 51be286..6c0b0dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-417615b900dbf7698ddcab503ed3424b docker-7999359.tar.gz
-bbd76651bfb3a723203e0e26ba8cb62c docker-man.tar.gz
+6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
new file mode 100644
index 0000000..7c3799b
--- /dev/null
+++ b/upstream-patched-archive-tar.patch
@@ -0,0 +1,108 @@
+diff -uNr docker-0.11.1/archive/archive.go docker-0.11.1-1/archive/archive.go
+--- docker-0.11.1/archive/archive.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive.go 2014-05-08 11:53:24.197382578 -0400
+@@ -8,7 +8,7 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "io/ioutil"
+ "os"
+diff -uNr docker-0.11.1/archive/archive_test.go docker-0.11.1-1/archive/archive_test.go
+--- docker-0.11.1/archive/archive_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/archive_test.go 2014-05-08 11:52:50.154420013 -0400
+@@ -3,7 +3,7 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "io/ioutil"
+ "os"
+diff -uNr docker-0.11.1/archive/changes.go docker-0.11.1-1/archive/changes.go
+--- docker-0.11.1/archive/changes.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/changes.go 2014-05-08 11:53:15.965391535 -0400
+@@ -5,7 +5,7 @@
+ "fmt"
+ "github.com/dotcloud/docker/pkg/system"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "os"
+ "path/filepath"
+diff -uNr docker-0.11.1/archive/diff.go docker-0.11.1-1/archive/diff.go
+--- docker-0.11.1/archive/diff.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/diff.go 2014-05-08 11:53:05.638403007 -0400
+@@ -2,7 +2,7 @@
+
+ import (
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "io/ioutil"
+ "os"
+diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
+--- docker-0.11.1/archive/wrap.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/archive/wrap.go 2014-05-08 11:52:57.609411753 -0400
+@@ -2,7 +2,7 @@
+
+ import (
+ "bytes"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io/ioutil"
+ )
+
+diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_test.go
+--- docker-0.11.1/graph/tags_unit_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/graph/tags_unit_test.go 2014-05-08 11:53:37.269368203 -0400
+@@ -6,7 +6,7 @@
+ _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
+ "github.com/dotcloud/docker/image"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "os"
+ "path"
+diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_test.go
+--- docker-0.11.1/integration/api_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/api_test.go 2014-05-08 11:53:45.654359060 -0400
+@@ -21,7 +21,7 @@
+ "github.com/dotcloud/docker/image"
+ "github.com/dotcloud/docker/runconfig"
+ "github.com/dotcloud/docker/utils"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ )
+
+ func TestGetEvents(t *testing.T) {
+diff -uNr docker-0.11.1/integration/utils_test.go docker-0.11.1-1/integration/utils_test.go
+--- docker-0.11.1/integration/utils_test.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/integration/utils_test.go 2014-05-08 11:53:52.186351827 -0400
+@@ -3,7 +3,7 @@
+ import (
+ "bytes"
+ "fmt"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "io"
+ "io/ioutil"
+ "net/http"
+diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
+--- docker-0.11.1/utils/tarsum.go 2014-05-07 20:29:56.000000000 -0400
++++ docker-0.11.1-1/utils/tarsum.go 2014-05-08 11:54:02.536340440 -0400
+@@ -5,7 +5,7 @@
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archiv..."
++ "archive/tar"
+ "hash"
+ "io"
+ "sort"
10 years
[golang/el6: 2/2] Merge branch 'master' into el6
by Vincent Batts
commit 3dab810ad86660f849a8f1f1eb73cb00bf037af3
Merge: 70cefcf c8bd3b7
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Fri May 9 08:23:47 2014 -0400
Merge branch 'master' into el6
.gitignore | 1 +
golang.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years
