From 19af886e8d7e160d43868c85d5148d87b025137b Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: May 20 2016 08:49:55 +0000 Subject: NVR: docker-2:1.11.1-3.git9dea74f - built docker @projectatomic/docker-1.11 commit 9dea74f - built docker-selinux commit 5b4f257 - built d-s-s commit f087cb1 - built docker-utils commit b851c03 - built docker-novolume-plugin commit 7715854 - built docker-v1.10-migrator commit 994c35 Signed-off-by: Antonio Murdaca --- diff --git a/.gitignore b/.gitignore index 3266d99..243e893 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /runc-e874369.tar.gz /docker-selinux-5b4f257.tar.gz /docker-aaa9488.tar.gz +/docker-9dea74f.tar.gz diff --git a/docker.service b/docker.service index c9da5aa..910de3a 100644 --- a/docker.service +++ b/docker.service @@ -11,6 +11,7 @@ EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/sysconfig/docker-storage EnvironmentFile=-/etc/sysconfig/docker-network Environment=GOTRACEBACK=crash +Environment=DOCKER_HTTP_HOST_COMPAT=1 ExecStart=/usr/bin/docker daemon \ --containerd /run/containerd.sock \ --exec-opt native.cgroupdriver=systemd \ diff --git a/docker.spec b/docker.spec index 8cebfc5..947bae8 100644 --- a/docker.spec +++ b/docker.spec @@ -28,7 +28,7 @@ # docker %global git0 https://github.com/projectatomic/%{repo} -%global commit0 aaa948831990962fd214e3d6da25b1e78cb2dce8 +%global commit0 9dea74f3a01d9a0b51ed6806c16af3e77a35a722 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # d-s-s @@ -95,7 +95,7 @@ Name: %{repo} %endif Epoch: 2 Version: 1.11.1 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -818,6 +818,14 @@ exit 0 %{_bindir}/v1.10-migrator-local %changelog +* Fri May 20 2016 Antonio Murdaca - 2:1.11.1-3.git9dea74f +- built docker @projectatomic/docker-1.11 commit 9dea74f +- built docker-selinux commit 5b4f257 +- built d-s-s commit f087cb1 +- built docker-utils commit b851c03 +- built docker-novolume-plugin commit 7715854 +- built docker-v1.10-migrator commit 994c35 + * Wed Apr 27 2016 Antonio Murdaca - 2:1.11.1-2.gitaaa9488 - built docker @projectatomic/docker-1.11 commit#aaa9488 - built docker-selinux commit#5b4f257 diff --git a/sources b/sources index 9644d74..5298ce1 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ c9d6361eea02ce306387748020a45e94 containerd-d2f0386.tar.gz -3023cd4a8bb95447a918d825bfb098e1 docker-aaa9488.tar.gz +2ad0ffadc8dbf270b0d8a683ca184b3d docker-9dea74f.tar.gz e237e3422b74ab7d98364cc753597377 docker-novolume-plugin-7715854.tar.gz b052eb006e5cb1be753bf3689ee6e0bb docker-selinux-5b4f257.tar.gz 323ce761db7f8b23f991341e4c995f31 docker-storage-setup-f087cb1.tar.gz