commit 1ff587c3ba17e691651ab4649f743f3a791b49c2 Author: Lokesh Mandvekar <l...@fedoraproject.org> Date: Wed Feb 18 01:43:44 2015 -0500
Resolves: rhbz#1191438 - update to 1.5.0 NVR: docker-io-1.5.0-1 -sysvinit file patch to fix stale pidfile issue when docker dies abruptly via Mike Leone <mleone...@gmail.com> -merge -pkg-devel into -devel Signed-off-by: Lokesh Mandvekar <l...@fedoraproject.org> 0001-docker-exec-patch-for-older-kernels.patch | 33 ---- docker-cert-path.patch | 35 ---- docker-io.spec | 206 ++++++++++++------------ docker.sysvinit | 8 + sources | 2 +- 5 files changed, 110 insertions(+), 174 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 239f654..9fd763a 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -10,12 +10,12 @@ %global repo %{project} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 5bc2ff8a36e9a768e8b479de4fe3ea9c9daf4121 +%global commit a8a31eff10544860d2188dddabdee4d727545796 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo}-io -Version: 1.4.1 -Release: 4%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.docker.com @@ -32,8 +32,6 @@ Source3: docker.sysvinit Source4: docker-network.sysconfig Source5: docker-logrotate.sh Source6: README.%{repo}-logrotate -Patch0: 0001-docker-exec-patch-for-older-kernels.patch -Patch1: docker-cert-path.patch BuildRequires: glibc-static BuildRequires: golang >= 1.3.3 # for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950 @@ -85,102 +83,102 @@ servers, OpenStack clusters, public instances, or combinations of the above. %package devel BuildRequires: golang >= 1.2.1-3 Requires: golang >= 1.2.1-3 -Requires: docker-io-pkg-devel +Provides: %{name}-pkg-devel Summary: A golang registry for global request variables (source libraries) -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/api) = %{version}-%{release} -Provides: golang(%{import_path}/api/client) = %{version}-%{release} -Provides: golang(%{import_path}/api/server) = %{version}-%{release} -Provides: golang(%{import_path}/builder) = %{version}-%{release} -Provides: golang(%{import_path}/builder/parser) = %{version}-%{release} -Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release} -Provides: golang(%{import_path}/builtins) = %{version}-%{release} -Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release} -Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release} -Provides: golang(%{import_path}/daemon) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release} -Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release} -Provides: golang(%{import_path}/dockerversion) = %{version}-%{release} -Provides: golang(%{import_path}/engine) = %{version}-%{release} -Provides: golang(%{import_path}/events) = %{version}-%{release} -Provides: golang(%{import_path}/graph) = %{version}-%{release} -Provides: golang(%{import_path}/image) = %{version}-%{release} -Provides: golang(%{import_path}/integration) = %{version}-%{release} -Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} -Provides: golang(%{import_path}/links) = %{version}-%{release} -Provides: golang(%{import_path}/nat) = %{version}-%{release} -Provides: golang(%{import_path}/opts) = %{version}-%{release} -Provides: golang(%{import_path}/registry) = %{version}-%{release} -Provides: golang(%{import_path}/runconfig) = %{version}-%{release} -Provides: golang(%{import_path}/trust) = %{version}-%{release} -Provides: golang(%{import_path}/utils) = %{version}-%{release} -Provides: golang(%{import_path}/volumes) = %{version}-%{release} +Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{import_path}/builder) = %{version}-%{release} +Provides: golang(%{import_path}/builder/parser) = %{version}-%{release} +Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release} +Provides: golang(%{import_path}/builder/command) = %{version}-%{release} +Provides: golang(%{import_path}/nat) = %{version}-%{release} +Provides: golang(%{import_path}/dockerversion) = %{version}-%{release} +Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: golang(%{import_path}/integration-cli) = %{version}-%{release} +Provides: golang(%{import_path}/trust) = %{version}-%{release} +Provides: golang(%{import_path}/events) = %{version}-%{release} +Provides: golang(%{import_path}/volumes) = %{version}-%{release} +Provides: golang(%{import_path}/dockerinit) = %{version}-%{release} +Provides: golang(%{import_path}/engine) = %{version}-%{release} +Provides: golang(%{import_path}/registry) = %{version}-%{release} +Provides: golang(%{import_path}/registry/v2) = %{version}-%{release} +Provides: golang(%{import_path}/api) = %{version}-%{release} +Provides: golang(%{import_path}/api/client) = %{version}-%{release} +Provides: golang(%{import_path}/api/stats) = %{version}-%{release} +Provides: golang(%{import_path}/api/server) = %{version}-%{release} +Provides: golang(%{import_path}/opts) = %{version}-%{release} +Provides: golang(%{import_path}/builtins) = %{version}-%{release} +Provides: golang(%{import_path}/runconfig) = %{version}-%{release} +Provides: golang(%{import_path}/docker) = %{version}-%{release} +Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release} +Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release} +Provides: golang(%{import_path}/daemon) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/overlay) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release} +Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/units) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/system) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/pubsub) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/urlutil) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/homedir) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/term) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release} +Provides: golang(%{import_path}/integration) = %{version}-%{release} +Provides: golang(%{import_path}/links) = %{version}-%{release} +Provides: golang(%{import_path}/image) = %{version}-%{release} +Provides: golang(%{import_path}/graph) = %{version}-%{release} %description devel This is the source libraries for docker. -%package pkg-devel -BuildRequires: golang >= 1.2.1-3 -Requires: golang >= 1.2.1-3 -Summary: A golang registry for global request variables (source libraries) -Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/log) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/system) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/term) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/units) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/version) = %{version}-%{release} - -%description pkg-devel -These source librariees are provided by docker, but are independent of docker specific logic. -The import paths of %{import_path}/pkg/... - %package fish-completion Summary: fish completion files for docker Requires: %{name} = %{version}-%{release} @@ -219,8 +217,6 @@ This package installs %{summary}. %prep %setup -q -n docker-%{version} cp %{SOURCE6} . -%patch0 -p1 -%patch1 -p1 %build # set up temporary build gopath, and put our directory there @@ -377,13 +373,6 @@ fi %dir %{gopath}/src/%{import_path} %{gopath}/src/%{import_path}/* -%files pkg-devel -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/pkg -%{gopath}/src/%{import_path}/pkg/* - %files fish-completion %dir %{_datadir}/fish/vendor_completions.d/ %{_datadir}/fish/vendor_completions.d/docker.fish @@ -401,6 +390,13 @@ fi %{_datadir}/zsh/site-functions/_docker %changelog +* Wed Feb 18 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.5.0-1 +- Resolves: rhbz#1191438 - update to 1.5.0 +- patched sysvinit file via upstream docker PR#10277 to fix stale +pidfile issue when docker dies abruptly, thanks to +Mike Leone <mleone...@gmail.com> +- merge -pkg-devel into -devel subpackage + * Fri Jan 16 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-4 - run tests inside docker repo in check (doesn't affect koji - not built) diff --git a/docker.sysvinit b/docker.sysvinit index f6c917a..8191308 100644 --- a/docker.sysvinit +++ b/docker.sysvinit @@ -43,6 +43,8 @@ prestart() { start() { [ -x $exec ] || exit 5 + check_for_cleanup + if ! [ -f $pidfile ]; then prestart printf "Starting $prog:\t" @@ -97,6 +99,12 @@ rh_status_q() { rh_status >/dev/null 2>&1 } +check_for_cleanup() { + if [ -f ${pidfile} ]; then + /bin/ps -fp $(cat ${pidfile}) > /dev/null || rm ${pidfile} + fi +} + case "$1" in start) rh_status_q && exit 0 diff --git a/sources b/sources index d1ed58d..01df76f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70068f2f59e8d4241ca344dcacdd2058 v1.4.1.tar.gz +a622207cd9eb21d95333501d2495ef5d v1.5.0.tar.gz _______________________________________________ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang