From b5e7f49716b969ee7c32f1b8f84660756d355f04 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 07 2018 09:35:14 +0000 Subject: import docker-latest-1.13.1-53.git774336d.el7 --- diff --git a/.docker-latest.metadata b/.docker-latest.metadata index 91f6167..8581d4b 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,7 +1,7 @@ a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/container-storage-setup-f7a3746.tar.gz -3dfa501d9be45ec3c3e4bdebf64e0999cccba29b SOURCES/containerd-89a5d2c.tar.gz -227d4d559b96ebc4ee6f7ab43a5c2d4722b1ac5d SOURCES/docker-9a813fa.tar.gz -ad7af9d5bdc942015d90ea28591fae7445bbfe2e SOURCES/libnetwork-460ac8f.tar.gz -ec4747330f0c9c3de272b62c5b5f5ec06cd69172 SOURCES/runc-518736e.tar.gz -22673281ea17a95f3f249f87ce3b4cda55d47966 SOURCES/tini-0effd37.tar.gz +402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz +3e38eb46a96ca48b28d06945543012f804be810e SOURCES/docker-774336d.tar.gz +fb49d4dd60e576f3a6412c2885256f8954fa5236 SOURCES/libnetwork-14db3c4.tar.gz +78795d104677625593c70e1dbe569f235b5af0c5 SOURCES/runc-e9c345b.tar.gz +c5c3577b90edc8902f3dd888e55334ba6e9e1ddf SOURCES/tini-5b117de.tar.gz 496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 6035d59..7a7c98b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/container-storage-setup-f7a3746.tar.gz -SOURCES/containerd-89a5d2c.tar.gz -SOURCES/docker-9a813fa.tar.gz -SOURCES/libnetwork-460ac8f.tar.gz -SOURCES/runc-518736e.tar.gz -SOURCES/tini-0effd37.tar.gz +SOURCES/containerd-296f1f8.tar.gz +SOURCES/docker-774336d.tar.gz +SOURCES/libnetwork-14db3c4.tar.gz +SOURCES/runc-e9c345b.tar.gz +SOURCES/tini-5b117de.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 1321065..5dc74d1 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 registries.service Wants=docker-latest-storage-setup.service +Requires=rhel-push-plugin.socket registries.service [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/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index c7a00d3..7bee265 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -21,12 +21,12 @@ # macros for 'docker' package VR %global docker_epoch 2 -%global docker_ver 1.12.6 -%global docker_rel 68 +%global docker_ver %{version} +%global docker_rel %{release} # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker 9a813fad75217ff3a3c1e0c1ecf5a9dd9dfbccf1 +%global commit_docker 774336db27bb8931c1705e47781b3842d290c968 %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 518736edd04da1dbd28a852d1b95a92ac5303fd8 +%global commit_runc e9c345b3f906d5dc5e8100b05ce37073a811c74a %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd %global git_containerd https://github.com/projectatomic/containerd -%global commit_containerd 89a5d2ce19344c8c8bbfef03b43434f60a4afcc2 +%global commit_containerd 296f1f80d6c6a83cc625163f863e53d3287328ee %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-init %global git_tini https://github.com/krallin/tini -%global commit_tini 0effd37412ba5ae7e00af0db1f36f5dbc1671df9 +%global commit_tini 5b117de7f824f3d3825737cf09581645abbe35d4 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 460ac8fa0bcc888f28f6dec93cdd3bf8b58f975a +%global commit_libnetwork 14db3c494c259b8caa159a244a8e9708e3f4b595 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo}-latest Version: 1.13.1 -Release: 37.git%{shortcommit_docker}%{?dist} +Release: 53.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -104,7 +104,7 @@ BuildRequires: sqlite-devel BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: pkgconfig(systemd) -Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel} +Requires: %{repo}-common >= %{docker_epoch}:%{version}-%{release} Requires: %{repo}-client-latest = %{version}-%{release} Requires(post): systemd Requires(preun): systemd @@ -171,9 +171,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} @@ -338,18 +338,17 @@ 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} -#mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/ +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} +mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt # install systemd/init scripts install -d %{buildroot}%{_unitdir} @@ -465,14 +464,14 @@ 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 %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/certs.d -#%dir %{_sysconfdir}/%{name}/certs.d/redhat.* -#%{_sysconfdir}/%{name}/certs.d/* +%dir %{_sysconfdir}/%{name}/certs.d/redhat.* +%{_sysconfdir}/%{name}/certs.d/* %{_datadir}/vim/vimfiles/doc/%{repo}file-latest.txt %{_datadir}/vim/vimfiles/ftdetect/%{repo}file-latest.vim %{_datadir}/vim/vimfiles/syntax/%{repo}file-latest.vim @@ -517,8 +516,45 @@ exit 0 %endif # with_migrator %changelog -* Mon Jan 29 2018 Johnny Hughes - 1.13.1-37.git9a813fa -- Manual CentOS Debrnading +* Tue Feb 20 2018 Lokesh Mandvekar - 1.13.1-53.git774336d +- built docker @projectatomic/docker-1.13.1-rhel commit 774336d +- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built docker-init commit 5b117de +- built libnetwork commit 14db3c4 + +* Mon Feb 12 2018 Lokesh Mandvekar - 1.13.1-52.gitce62987 +- built docker @projectatomic/docker-1.13.1-rhel commit ce62987 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built docker-init commit 0effd37 +- built libnetwork commit 1ba8194 + +* Mon Feb 05 2018 Lokesh Mandvekar - 1.13.1-48.gitec9911e +- keep in sync with docker + +* Mon Feb 05 2018 Lokesh Mandvekar - 1.13.1-47.gitec9911e +- Require docker-common >= 2:1.13.1-47 RE: #1542112 + +* Mon Feb 05 2018 Lokesh Mandvekar - 1.13.1-46.gitec9911e +- Require docker-common >= 2:1.13.1-46 RE: #1542112 + +* Thu Feb 01 2018 Lokesh Mandvekar - 1.13.1-45.gitec9911e +- sync release tag with docker + +* Thu Feb 01 2018 Lokesh Mandvekar - 1.13.1-44.gitec9911e +- built docker @projectatomic/docker-1.13.1-rhel commit ec9911e +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 518736e +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built docker-init commit 0effd37 +- built libnetwork commit 20dd462 + +* Tue Jan 30 2018 Lokesh Mandvekar - 1.13.1-43.gitec9911e +- built docker @projectatomic/docker-1.13.1-rhel commit ec9911e +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 518736e +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built docker-init commit 0effd37 +- built libnetwork commit 20dd462 * Tue Dec 12 2017 Lokesh Mandvekar - 1.13.1-37.git9a813fa - Resolves: #1524633 - start daemon after registries.service