[Bug 1047194] etcd-0.3.0 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1047194 Upstream Release Monitoring changed: What|Removed |Added Summary|etcd-0.2.0 is available |etcd-0.3.0 is available --- Comment #1 from Upstream Release Monitoring --- Latest upstream release: 0.3.0 Current version/release in Fedora Rawhide: 0.1.2-5.fc21 URL: https://api.github.com/repos/coreos/etcd/tags Please consult the package updates policy before you issue an update to a stable branch: https://fedoraproject.org/wiki/Updates_Policy More information about the service that created this bug can be found at: https://fedoraproject.org/wiki/Upstream_release_monitoring -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1059743] bad filenames in rpm scriptlets
https://bugzilla.redhat.com/show_bug.cgi?id=1059743 --- Comment #1 from Fedora Update System --- docker-io-0.8.0-1.fc20 has been submitted as an update for Fedora 20. https://admin.fedoraproject.org/updates/FEDORA-2014-2112/docker-io-0.8.0-1.fc20 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1059743] bad filenames in rpm scriptlets
https://bugzilla.redhat.com/show_bug.cgi?id=1059743 Fedora Update System changed: What|Removed |Added Status|NEW |MODIFIED -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1059743] bad filenames in rpm scriptlets
https://bugzilla.redhat.com/show_bug.cgi?id=1059743 --- Comment #2 from Fedora Update System --- docker-io-0.8.0-1.fc19 has been submitted as an update for Fedora 19. https://admin.fedoraproject.org/updates/FEDORA-2014-2110/docker-io-0.8.0-1.fc19 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1046882] docker-io: Make it available for EPEL 7
https://bugzilla.redhat.com/show_bug.cgi?id=1046882 Lokesh Mandvekar changed: What|Removed |Added Status|NEW |CLOSED Resolution|--- |CURRENTRELEASE Last Closed||2014-02-08 19:10:20 --- Comment #6 from Lokesh Mandvekar --- doesn't look like this will autoclose. fwiw: here's 0.8.0-2 for epel7 http://koji.fedoraproject.org/koji/buildinfo?buildID=497005 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1059743] bad filenames in rpm scriptlets
https://bugzilla.redhat.com/show_bug.cgi?id=1059743 --- Comment #3 from Fedora Update System --- docker-io-0.8.0-2.fc19 has been submitted as an update for Fedora 19. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.fc19 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1062177] docker-io-0.8.0 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1062177 --- Comment #6 from Fedora Update System --- docker-io-0.8.0-2.fc20 has been submitted as an update for Fedora 20. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.fc20 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1059743] bad filenames in rpm scriptlets
https://bugzilla.redhat.com/show_bug.cgi?id=1059743 --- Comment #4 from Fedora Update System --- docker-io-0.8.0-2.fc20 has been submitted as an update for Fedora 20. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.fc20 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1062177] docker-io-0.8.0 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1062177 --- Comment #5 from Fedora Update System --- docker-io-0.8.0-2.fc19 has been submitted as an update for Fedora 19. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.fc19 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1062177] docker-io-0.8.0 is available
https://bugzilla.redhat.com/show_bug.cgi?id=1062177 --- Comment #7 from Fedora Update System --- docker-io-0.8.0-2.el6 has been submitted as an update for Fedora EPEL 6. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.el6 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1061431] containers are inaccessible after upgrade
https://bugzilla.redhat.com/show_bug.cgi?id=1061431 --- Comment #3 from Fedora Update System --- docker-io-0.8.0-2.el6 has been submitted as an update for Fedora EPEL 6. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.el6 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[Bug 1061433] unable to remove containers after update
https://bugzilla.redhat.com/show_bug.cgi?id=1061433 --- Comment #3 from Fedora Update System --- docker-io-0.8.0-2.el6 has been submitted as an update for Fedora EPEL 6. https://admin.fedoraproject.org/updates/docker-io-0.8.0-2.el6 -- You are receiving this mail because: You are on the CC list for the bug. ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io] upstream bump to v0.8.0 BZ1062177
commit 3ca11d47e4bc11c6b9337572c8aa11d23f7c3423
Author: Lokesh Mandvekar
Date: Thu Feb 6 10:57:33 2014 -0500
upstream bump to v0.8.0 BZ1062177
Signed-off-by: Lokesh Mandvekar
devicemapper-discard-freespace.patch | 137 --
docker-io.spec | 49 ---
docker.service | 13 --
ignore-btrfs-for-rhel6.patch | 256 ++
sources |2 +-
5 files changed, 282 insertions(+), 175 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b7e73af..8d43bbc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,26 +9,25 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
+%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version:0.7.6
-Release:4%{?dist}
+Version:0.8.0
+Release:1%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: devicemapper-discard-freespace.patch
+Patch0: ignore-btrfs-for-rhel6.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
-Source2:docker.sysconfig
-Source3:docker.sysvinit
-Source4:docker.1
+Source1:docker.sysconfig
+Source2:docker.sysvinit
+Source3:docker.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2 and above
@@ -40,6 +39,10 @@ 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: device-mapper-devel
+#btrfs not available for rhel6
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: btrfs-progs-devel
+%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
@@ -76,9 +79,9 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-# discard free space after deleting image
-# https://bugzilla.redhat.com/show_bug.cgi?id=1055645
-%patch0 -p1 -b devicemapper-discard-freespace
+%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
+%patch0 -p1 -b ignore-btrfs-for-rhel6
+%endif
%build
mkdir _build
@@ -86,6 +89,7 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
@@ -102,17 +106,17 @@ 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 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE3} %{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
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
+install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
@@ -123,7 +127,7 @@ exit 0
%post
%if %{with systemd}
-%systemd_post %{SOURCE1}
+%systemd_post docker
%else
# install but don't activate
/sbin/chkconfig --add docker
@@ -131,7 +135,7 @@ exit 0
%preun
%if %{with systemd}
-%systemd_preun %{SOURCE1}
+%systemd_preun docker
%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
@@ -139,7 +143,7 @@ exit 0
%postun
%if %{with systemd}
-%systemd_postun_with_restart %{SOURCE1}
+%systemd_postun_with_restart docker
%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
@@ -167,12 +171,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
-* Wed Jan 22 2014 Lo
[docker-io/f20] upstream bump to v0.8.0 BZ1062177
commit d8b2e8a3dcbf983287724fb31867a95ff2f2
Author: Lokesh Mandvekar
Date: Thu Feb 6 10:57:33 2014 -0500
upstream bump to v0.8.0 BZ1062177
Signed-off-by: Lokesh Mandvekar
devicemapper-discard-freespace.patch | 137 --
docker-io.spec | 49 ---
docker.service | 13 --
ignore-btrfs-for-rhel6.patch | 256 ++
sources |2 +-
5 files changed, 282 insertions(+), 175 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b7e73af..8d43bbc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,26 +9,25 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
+%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version:0.7.6
-Release:4%{?dist}
+Version:0.8.0
+Release:1%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: devicemapper-discard-freespace.patch
+Patch0: ignore-btrfs-for-rhel6.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
-Source2:docker.sysconfig
-Source3:docker.sysvinit
-Source4:docker.1
+Source1:docker.sysconfig
+Source2:docker.sysvinit
+Source3:docker.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2 and above
@@ -40,6 +39,10 @@ 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: device-mapper-devel
+#btrfs not available for rhel6
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: btrfs-progs-devel
+%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
@@ -76,9 +79,9 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-# discard free space after deleting image
-# https://bugzilla.redhat.com/show_bug.cgi?id=1055645
-%patch0 -p1 -b devicemapper-discard-freespace
+%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
+%patch0 -p1 -b ignore-btrfs-for-rhel6
+%endif
%build
mkdir _build
@@ -86,6 +89,7 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
@@ -102,17 +106,17 @@ 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 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE3} %{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
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
+install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
@@ -123,7 +127,7 @@ exit 0
%post
%if %{with systemd}
-%systemd_post %{SOURCE1}
+%systemd_post docker
%else
# install but don't activate
/sbin/chkconfig --add docker
@@ -131,7 +135,7 @@ exit 0
%preun
%if %{with systemd}
-%systemd_preun %{SOURCE1}
+%systemd_preun docker
%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
@@ -139,7 +143,7 @@ exit 0
%postun
%if %{with systemd}
-%systemd_postun_with_restart %{SOURCE1}
+%systemd_postun_with_restart docker
%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
@@ -167,12 +171,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
-* Wed Jan 22 2014 Lo
File v0.8.0.tar.gz uploaded to lookaside cache by lsm5
A file has been added to the lookaside cache for docker-io: 737aec190c2ad81b00192f858f9ed31b v0.8.0.tar.gz ___ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang
[docker-io/f19] upstream bump to v0.8.0 BZ1062177
commit 0c102aeaab066a8af27e1b205307eb30126045e0
Author: Lokesh Mandvekar
Date: Thu Feb 6 10:57:33 2014 -0500
upstream bump to v0.8.0 BZ1062177
Signed-off-by: Lokesh Mandvekar
devicemapper-discard-freespace.patch | 137 --
docker-io.spec | 49 ---
docker.service | 13 --
ignore-btrfs-for-rhel6.patch | 256 ++
sources |2 +-
5 files changed, 282 insertions(+), 175 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b7e73af..8d43bbc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,26 +9,25 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
+%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version:0.7.6
-Release:4%{?dist}
+Version:0.8.0
+Release:1%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: devicemapper-discard-freespace.patch
+Patch0: ignore-btrfs-for-rhel6.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
-Source2:docker.sysconfig
-Source3:docker.sysvinit
-Source4:docker.1
+Source1:docker.sysconfig
+Source2:docker.sysvinit
+Source3:docker.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2 and above
@@ -40,6 +39,10 @@ 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: device-mapper-devel
+#btrfs not available for rhel6
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: btrfs-progs-devel
+%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
@@ -76,9 +79,9 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-# discard free space after deleting image
-# https://bugzilla.redhat.com/show_bug.cgi?id=1055645
-%patch0 -p1 -b devicemapper-discard-freespace
+%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
+%patch0 -p1 -b ignore-btrfs-for-rhel6
+%endif
%build
mkdir _build
@@ -86,6 +89,7 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
@@ -102,17 +106,17 @@ 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 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE3} %{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
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
+install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
@@ -123,7 +127,7 @@ exit 0
%post
%if %{with systemd}
-%systemd_post %{SOURCE1}
+%systemd_post docker
%else
# install but don't activate
/sbin/chkconfig --add docker
@@ -131,7 +135,7 @@ exit 0
%preun
%if %{with systemd}
-%systemd_preun %{SOURCE1}
+%systemd_preun docker
%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
@@ -139,7 +143,7 @@ exit 0
%postun
%if %{with systemd}
-%systemd_postun_with_restart %{SOURCE1}
+%systemd_postun_with_restart docker
%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
@@ -167,12 +171,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
-* Wed Jan 22 2014 Lo
[docker-io/epel7] vim syntax highlighting, ignore btrfs for rhel
commit c69f6a23f858539eab1ea2b4e8328ae87b5a4cce
Author: Lokesh Mandvekar
Date: Sat Feb 8 18:55:51 2014 -0500
vim syntax highlighting, ignore btrfs for rhel
Signed-off-by: Lokesh Mandvekar
docker-io.spec | 53 ++-
...-for-rhel6.patch => ignore-btrfs-for-rhel.patch |0
2 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8d43bbc..48cb5e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,11 +14,11 @@
Name: docker-io
Version:0.8.0
-Release:1%{?dist}
+Release:2%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: ignore-btrfs-for-rhel6.patch
+Patch0: ignore-btrfs-for-rhel.patch
URL:http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -39,8 +39,8 @@ 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: device-mapper-devel
-#btrfs not available for rhel6
-%if 0%{?fedora} || 0%{?rhel} > 7
+# btrfs not available for rhel yet
+%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
%if %{with systemd}
@@ -79,8 +79,8 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-%patch0 -p1 -b ignore-btrfs-for-rhel6
+%if 0%{?rhel}
+%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
%build
@@ -89,26 +89,42 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+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 -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 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
+# install dockerinit
+install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
+install -d %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{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
+# install zsh completion
+install -d %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
+# install vim syntax highlighting
+install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
+install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt
%{buildroot}%{_datadir}/vim/vimfiles/doc
+install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/syntax
+# install udev rules
+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 -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
@@ -118,8 +134,6 @@ install -p -m 644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -153,6 +167,7 @@ fi
%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/docker.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
@@ -169,8 +184,18 @@ fi
%dir %{_sharedstatedir}/docker
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_da
[docker-io/epel7] upstream bump to v0.8.0 BZ1062177
commit 5bb288fec62df5e12871b4f2042a9c13d28979a0
Author: Lokesh Mandvekar
Date: Thu Feb 6 10:57:33 2014 -0500
upstream bump to v0.8.0 BZ1062177
Signed-off-by: Lokesh Mandvekar
devicemapper-discard-freespace.patch | 137 --
docker-io.spec | 49 ---
docker.service | 13 --
ignore-btrfs-for-rhel6.patch | 256 ++
sources |2 +-
5 files changed, 282 insertions(+), 175 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b7e73af..8d43bbc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,26 +9,25 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
+%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version:0.7.6
-Release:4%{?dist}
+Version:0.8.0
+Release:1%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: devicemapper-discard-freespace.patch
+Patch0: ignore-btrfs-for-rhel6.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
-Source2:docker.sysconfig
-Source3:docker.sysvinit
-Source4:docker.1
+Source1:docker.sysconfig
+Source2:docker.sysvinit
+Source3:docker.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2 and above
@@ -40,6 +39,10 @@ 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: device-mapper-devel
+#btrfs not available for rhel6
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: btrfs-progs-devel
+%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
@@ -76,9 +79,9 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-# discard free space after deleting image
-# https://bugzilla.redhat.com/show_bug.cgi?id=1055645
-%patch0 -p1 -b devicemapper-discard-freespace
+%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
+%patch0 -p1 -b ignore-btrfs-for-rhel6
+%endif
%build
mkdir _build
@@ -86,6 +89,7 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
@@ -102,17 +106,17 @@ 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 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE3} %{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
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
+install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
@@ -123,7 +127,7 @@ exit 0
%post
%if %{with systemd}
-%systemd_post %{SOURCE1}
+%systemd_post docker
%else
# install but don't activate
/sbin/chkconfig --add docker
@@ -131,7 +135,7 @@ exit 0
%preun
%if %{with systemd}
-%systemd_preun %{SOURCE1}
+%systemd_preun docker
%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
@@ -139,7 +143,7 @@ exit 0
%postun
%if %{with systemd}
-%systemd_postun_with_restart %{SOURCE1}
+%systemd_postun_with_restart docker
%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
@@ -167,12 +171,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
-* Wed Jan 22 2014 Lo
[docker-io/f19] vim syntax highlighting, ignore btrfs for rhel
commit 2dd3409d8943c4e6f1a11c73f6d8a399ec7c29d3
Author: Lokesh Mandvekar
Date: Sat Feb 8 18:55:51 2014 -0500
vim syntax highlighting, ignore btrfs for rhel
Signed-off-by: Lokesh Mandvekar
docker-io.spec | 53 ++-
...-for-rhel6.patch => ignore-btrfs-for-rhel.patch |0
2 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8d43bbc..48cb5e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,11 +14,11 @@
Name: docker-io
Version:0.8.0
-Release:1%{?dist}
+Release:2%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: ignore-btrfs-for-rhel6.patch
+Patch0: ignore-btrfs-for-rhel.patch
URL:http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -39,8 +39,8 @@ 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: device-mapper-devel
-#btrfs not available for rhel6
-%if 0%{?fedora} || 0%{?rhel} > 7
+# btrfs not available for rhel yet
+%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
%if %{with systemd}
@@ -79,8 +79,8 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-%patch0 -p1 -b ignore-btrfs-for-rhel6
+%if 0%{?rhel}
+%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
%build
@@ -89,26 +89,42 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+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 -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 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
+# install dockerinit
+install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
+install -d %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{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
+# install zsh completion
+install -d %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
+# install vim syntax highlighting
+install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
+install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt
%{buildroot}%{_datadir}/vim/vimfiles/doc
+install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/syntax
+# install udev rules
+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 -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
@@ -118,8 +134,6 @@ install -p -m 644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -153,6 +167,7 @@ fi
%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/docker.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
@@ -169,8 +184,18 @@ fi
%dir %{_sharedstatedir}/docker
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_da
[docker-io/el6] upstream bump to v0.8.0 BZ1062177
commit 868f438f146726de3f01981dec7da74df16ca0c8
Author: Lokesh Mandvekar
Date: Thu Feb 6 10:57:33 2014 -0500
upstream bump to v0.8.0 BZ1062177
Signed-off-by: Lokesh Mandvekar
devicemapper-discard-freespace.patch | 137 --
docker-io.spec | 49 ---
docker.service | 13 --
ignore-btrfs-for-rhel6.patch | 256 ++
sources |2 +-
5 files changed, 282 insertions(+), 175 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b7e73af..8d43bbc 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,26 +9,25 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
+%global commit cc3a8c8d8ec57e15b7b7316797132d770408ab1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version:0.7.6
-Release:4%{?dist}
+Version:0.8.0
+Release:1%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: devicemapper-discard-freespace.patch
+Patch0: ignore-btrfs-for-rhel6.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
-Source2:docker.sysconfig
-Source3:docker.sysvinit
-Source4:docker.1
+Source1:docker.sysconfig
+Source2:docker.sysvinit
+Source3:docker.1
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2 and above
@@ -40,6 +39,10 @@ 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: device-mapper-devel
+#btrfs not available for rhel6
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: btrfs-progs-devel
+%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
Requires: systemd-units
@@ -76,9 +79,9 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-# discard free space after deleting image
-# https://bugzilla.redhat.com/show_bug.cgi?id=1055645
-%patch0 -p1 -b devicemapper-discard-freespace
+%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
+%patch0 -p1 -b ignore-btrfs-for-rhel6
+%endif
%build
mkdir _build
@@ -86,6 +89,7 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
+
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
@@ -102,17 +106,17 @@ 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 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE3} %{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
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
+install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
@@ -123,7 +127,7 @@ exit 0
%post
%if %{with systemd}
-%systemd_post %{SOURCE1}
+%systemd_post docker
%else
# install but don't activate
/sbin/chkconfig --add docker
@@ -131,7 +135,7 @@ exit 0
%preun
%if %{with systemd}
-%systemd_preun %{SOURCE1}
+%systemd_preun docker
%else
/sbin/service docker stop >/dev/null 2>&1
/sbin/chkconfig --del docker
@@ -139,7 +143,7 @@ exit 0
%postun
%if %{with systemd}
-%systemd_postun_with_restart %{SOURCE1}
+%systemd_postun_with_restart docker
%else
if [ "$1" -ge "1" ] ; then
/sbin/service docker condrestart >/dev/null 2>&1 || :
@@ -167,12 +171,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
-* Wed Jan 22 2014 Lo
[docker-io/f20] vim syntax highlighting, ignore btrfs for rhel
commit 2699b46c8c17807b898c4ec729c3970951db476a
Author: Lokesh Mandvekar
Date: Sat Feb 8 18:55:51 2014 -0500
vim syntax highlighting, ignore btrfs for rhel
Signed-off-by: Lokesh Mandvekar
docker-io.spec | 53 ++-
...-for-rhel6.patch => ignore-btrfs-for-rhel.patch |0
2 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8d43bbc..48cb5e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,11 +14,11 @@
Name: docker-io
Version:0.8.0
-Release:1%{?dist}
+Release:2%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: ignore-btrfs-for-rhel6.patch
+Patch0: ignore-btrfs-for-rhel.patch
URL:http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -39,8 +39,8 @@ 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: device-mapper-devel
-#btrfs not available for rhel6
-%if 0%{?fedora} || 0%{?rhel} > 7
+# btrfs not available for rhel yet
+%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
%if %{with systemd}
@@ -79,8 +79,8 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-%patch0 -p1 -b ignore-btrfs-for-rhel6
+%if 0%{?rhel}
+%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
%build
@@ -89,26 +89,42 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+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 -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 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
+# install dockerinit
+install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
+install -d %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{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
+# install zsh completion
+install -d %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
+# install vim syntax highlighting
+install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
+install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt
%{buildroot}%{_datadir}/vim/vimfiles/doc
+install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/syntax
+# install udev rules
+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 -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
@@ -118,8 +134,6 @@ install -p -m 644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -153,6 +167,7 @@ fi
%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/docker.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
@@ -169,8 +184,18 @@ fi
%dir %{_sharedstatedir}/docker
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_da
[docker-io/el6] vim syntax highlighting, ignore btrfs for rhel
commit fff5e2706bf84535af863b139d0693aeb4bad5e9
Author: Lokesh Mandvekar
Date: Sat Feb 8 18:55:51 2014 -0500
vim syntax highlighting, ignore btrfs for rhel
Signed-off-by: Lokesh Mandvekar
docker-io.spec | 53 ++-
...-for-rhel6.patch => ignore-btrfs-for-rhel.patch |0
2 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8d43bbc..48cb5e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,11 +14,11 @@
Name: docker-io
Version:0.8.0
-Release:1%{?dist}
+Release:2%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: ignore-btrfs-for-rhel6.patch
+Patch0: ignore-btrfs-for-rhel.patch
URL:http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -39,8 +39,8 @@ 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: device-mapper-devel
-#btrfs not available for rhel6
-%if 0%{?fedora} || 0%{?rhel} > 7
+# btrfs not available for rhel yet
+%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
%if %{with systemd}
@@ -79,8 +79,8 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-%patch0 -p1 -b ignore-btrfs-for-rhel6
+%if 0%{?rhel}
+%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
%build
@@ -89,26 +89,42 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+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 -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 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
+# install dockerinit
+install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
+install -d %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{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
+# install zsh completion
+install -d %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
+# install vim syntax highlighting
+install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
+install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt
%{buildroot}%{_datadir}/vim/vimfiles/doc
+install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/syntax
+# install udev rules
+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 -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
@@ -118,8 +134,6 @@ install -p -m 644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -153,6 +167,7 @@ fi
%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/docker.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
@@ -169,8 +184,18 @@ fi
%dir %{_sharedstatedir}/docker
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_da
[docker-io] vim syntax highlighting, ignore btrfs for rhel
commit 845dcb934ad5b26d2bf34bd13217e87cd5f5ad8a
Author: Lokesh Mandvekar
Date: Sat Feb 8 18:55:51 2014 -0500
vim syntax highlighting, ignore btrfs for rhel
Signed-off-by: Lokesh Mandvekar
docker-io.spec | 53 ++-
...-for-rhel6.patch => ignore-btrfs-for-rhel.patch |0
2 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 8d43bbc..48cb5e0 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,11 +14,11 @@
Name: docker-io
Version:0.8.0
-Release:1%{?dist}
+Release:2%{?dist}
Summary:Automates deployment of containerized applications
License:ASL 2.0
-Patch0: ignore-btrfs-for-rhel6.patch
+Patch0: ignore-btrfs-for-rhel.patch
URL:http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
@@ -39,8 +39,8 @@ 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: device-mapper-devel
-#btrfs not available for rhel6
-%if 0%{?fedora} || 0%{?rhel} > 7
+# btrfs not available for rhel yet
+%if 0%{?fedora}
BuildRequires: btrfs-progs-devel
%endif
%if %{with systemd}
@@ -79,8 +79,8 @@ servers, OpenStack clusters, public instances, or
combinations of the above.
%prep
%setup -q -n docker-%{version}
rm -rf vendor
-%if 0%{?rhel} >= 6 && 0%{?rhel} < 7
-%patch0 -p1 -b ignore-btrfs-for-rhel6
+%if 0%{?rhel}
+%patch0 -p1 -b ignore-btrfs-for-rhel
%endif
%build
@@ -89,26 +89,42 @@ mkdir _build
pushd _build
mkdir -p src/github.com/dotcloud
ln -s $(dirs +1 -l) src/github.com/dotcloud/docker
-
popd
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
+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 -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 bundles/%{version}/dynbinary/docker-%{version}
%{buildroot}%{_bindir}/docker
+# install dockerinit
+install -d %{buildroot}%{_libexecdir}/docker
install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version}
%{buildroot}%{_libexecdir}/docker/dockerinit
+# install manpage
+install -d %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{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
+# install zsh completion
+install -d %{buildroot}%{_datadir}/zsh/site-functions
install -p -m 644 contrib/completion/zsh/_docker
%{buildroot}%{_datadir}/zsh/site-functions
+# install vim syntax highlighting
+install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
+install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt
%{buildroot}%{_datadir}/vim/vimfiles/doc
+install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim
%{buildroot}%{_datadir}/vim/vimfiles/syntax
+# install udev rules
+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 -d %{buildroot}%{_unitdir}
install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
@@ -118,8 +134,6 @@ install -p -m 644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/sysconfig/docker
install -d %{buildroot}%{_initddir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_initddir}/docker
%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 contrib/udev/80-docker.rules
%{buildroot}%{_sysconfdir}/udev/rules.d
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -153,6 +167,7 @@ fi
%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/docker.1.gz
%{_bindir}/docker
%dir %{_libexecdir}/docker
@@ -169,8 +184,18 @@ fi
%dir %{_sharedstatedir}/docker
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_da
