From 12708d880466cf14c11bd942a60d124179e7f24d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 28 2017 15:12:07 +0000 Subject: import docker-latest-1.13.1-13.gitb303bf6.el7 --- diff --git a/.docker-latest.metadata b/.docker-latest.metadata index 284c958..73b1596 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,7 +1,7 @@ -e85e178f427c3be0c06542b53ec973273a179d0d SOURCES/containerd-03e5862.tar.gz -e34fa473b340adabc8361c7b9de4022accb551cc SOURCES/docker-3a17ad5.tar.gz +edee2dd2844c4a220864fe3ec0442bc337e0d383 SOURCES/containerd-e39d94f.tar.gz +6bfaa31f709952d52ce3572a8714208443ee5a8c SOURCES/docker-b303bf6.tar.gz a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/docker-storage-setup-f7a3746.tar.gz -1dd4909fca7307c3da51e839252ecf03207100fb SOURCES/libnetwork-929077d.tar.gz -b439a84a41399362a37f0a82de97176e07a0044f SOURCES/runc-3753658.tar.gz -a097f1adcbf8c793a405af91730b78204ba3e60b SOURCES/tini-6ad9813.tar.gz +66c83bf2232e9e153196a60ee97de10ecc02caf3 SOURCES/libnetwork-6426d1e.tar.gz +c8383936f11e8e8491b83fd9dac5adbe36c45da8 SOURCES/runc-2ade59f.tar.gz +4216c3edc139a56bb8363853f4f534d9c2439512 SOURCES/tini-eb3987c.tar.gz ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index cf107fd..ff32189 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -SOURCES/containerd-03e5862.tar.gz -SOURCES/docker-3a17ad5.tar.gz +SOURCES/containerd-e39d94f.tar.gz +SOURCES/docker-b303bf6.tar.gz SOURCES/docker-storage-setup-f7a3746.tar.gz -SOURCES/libnetwork-929077d.tar.gz -SOURCES/runc-3753658.tar.gz -SOURCES/tini-6ad9813.tar.gz +SOURCES/libnetwork-6426d1e.tar.gz +SOURCES/runc-2ade59f.tar.gz +SOURCES/tini-eb3987c.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 28b4410..8b813a8 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.service @@ -1,8 +1,9 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target +After=network.target rhel-push-plugin.socket Wants=docker-latest-storage-setup.service +Requires=rhel-push-plugin.socket [Service] Type=notify @@ -17,6 +18,7 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin ExecStart=/usr/bin/dockerd-latest \ --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \ --default-runtime=docker-runc \ + --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \ --seccomp-profile=/etc/docker-latest/seccomp.json \ diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig index b240c20..7bf6915 100644 --- a/SOURCES/docker-latest.sysconfig +++ b/SOURCES/docker-latest.sysconfig @@ -8,7 +8,7 @@ DOCKER_CERT_PATH=/etc/docker # pull use the #ADD_REGISTRY option to list a set of registries, each prepended # with --add-registry flag. The first registry added will be the first registry # searched. -#ADD_REGISTRY='--add-registry registry.access.redhat.com' +ADD_REGISTRY='--add-registry registry.access.redhat.com' # If you want to block registries from being used, uncomment the BLOCK_REGISTRY # option and give it a set of registries, each prepended with --block-registry diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index 62697c1..de2309b 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -26,7 +26,7 @@ # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker 3a17ad53336040e731130f2abd3ffbb13409d402 +%global commit_docker b303bf68b7f06f751ce4887377ffb2ce02836fd7 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1-rhel @@ -46,27 +46,27 @@ # docker-runc %global git_runc https://github.com/projectatomic/runc -%global commit_runc 375365825d2cd12cd2ea6cb9d34df34a1581abd9 +%global commit_runc 2ade59f1c16aca02c74b1bd3681522bd13cf0af2 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd %global git_containerd https://github.com/projectatomic/containerd -%global commit_containerd 03e5862ec0d8d3b3f750e19fca3ee367e13c090e +%global commit_containerd e39d94f23ea6148d73de7f94aa7cf7ef47656128 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-init %global git_tini https://github.com/krallin/tini -%global commit_tini 6ad9813ed8864150774c9ec3672b5b713b6b2902 +%global commit_tini eb3987cd023eb877b8a05d54023b7885e81a8acd %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 929077d0db4e9ed4fc543d4f77a60584c27df327 +%global commit_libnetwork 6426d1e66f33c0b0c8bb135b7ee547447f54d043 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo}-latest Version: 1.13.1 -Release: 11.git%{shortcommit_docker}%{?dist} +Release: 13.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -108,7 +108,7 @@ Requires: device-mapper-libs >= 7:1.02.97 Requires: container-selinux >= 2:2.12-2 Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel} Requires: %{repo}-client-latest = %{version}-%{release} -#Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel} +Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel} Requires: oci-register-machine >= 1:0-3.10 Requires: oci-systemd-hook >= 1:0.1.4-9 Requires(post): systemd @@ -193,9 +193,9 @@ Requires: %{repo}-common cp %{SOURCE9} . # rhel debranding for centos -#%if 0%{?centos} -#sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} -#%endif +%if 0%{?centos} +sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} +%endif # untar d-s-s tar zxf %{SOURCE1} @@ -360,11 +360,11 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name} install -d %{buildroot}%{_sharedstatedir}/%{name} # install secret patch directory -#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets # rhbz#1110876 - update symlinks for subscription management -#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement -#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm -#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo +ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement +ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm +ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt @@ -484,8 +484,8 @@ exit 0 %{_unitdir}/%{name}-cleanup.service %{_unitdir}/%{name}-cleanup.timer %{_datadir}/bash-completion/completions/%{name} -#%dir %{_datadir}/rhel -#%{_datadir}/rhel/* +%dir %{_datadir}/rhel +%{_datadir}/rhel/* %dir %{_sharedstatedir}/%{name} %{_udevrulesdir}/80-%{name}.rules %{_sysconfdir}/%{name} @@ -533,8 +533,20 @@ exit 0 %endif # with_migrator %changelog -* Fri May 26 2017 Johnny Hughes - 1.13.1-11.git3a17ad5 -- Manual CentOS Debranding +* Mon Jun 19 2017 Lokesh Mandvekar - 1.13.1-13.gitb303bf6 +- Resolves: #1463003 +- built docker @projectatomic/docker-1.13.1-rhel commit b303bf6 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 2ade59f +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit e39d94f +- built docker-init commit eb3987c +- built libnetwork commit 6426d1e + +* Tue Jun 06 2017 Lokesh Mandvekar - 1.13.1-12.git55ffbf0 +- built docker @projectatomic/docker-1.13.1-rhel commit 55ffbf0 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 2ade59f +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit e39d94f +- built docker-init commit 81f886d +- built libnetwork commit eed0fe8 * Tue May 17 2017 Lokesh Mandvekar - 1.13.1-11.git3a17ad5 - Resolves: #1451796