From 6e0686011a03be7dddd3edb275ef8ff03a63bfbb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2017 14:34:20 +0000 Subject: import docker-latest-1.13.1-26.git1faa135.el7 --- diff --git a/.docker-latest.metadata b/.docker-latest.metadata index 474df97..27c1800 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,7 +1,7 @@ a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/container-storage-setup-f7a3746.tar.gz 0b0730569b88b527d2265e79def8cb35e042cba3 SOURCES/containerd-89a5d2c.tar.gz -3c34cc02ebd097aa11e731b6b879b8073fa83326 SOURCES/docker-28ae36d.tar.gz -de236ecfac2b933993837a6439cf0d7624f248c5 SOURCES/libnetwork-da27c78.tar.gz -fac7c7a94e7e02b25bebf60756f5f990cbc85a84 SOURCES/runc-b59a6bb.tar.gz -4cb9381a908a8e510e8568f471d08535f6a980a3 SOURCES/tini-4892d4d.tar.gz +b7a02b27dd6abb6130d58e57c69eea9bbd4a2a37 SOURCES/docker-1faa135.tar.gz +e94778b0f3b61731bba467eb5588440c4a7fcb0b SOURCES/libnetwork-0f08d31.tar.gz +5426e8d1e339d035efa81dcfaaa59be40a9fbcf3 SOURCES/runc-771c53e.tar.gz +22673281ea17a95f3f249f87ce3b4cda55d47966 SOURCES/tini-0effd37.tar.gz ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 0fcab01..6a3bcc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/container-storage-setup-f7a3746.tar.gz SOURCES/containerd-89a5d2c.tar.gz -SOURCES/docker-28ae36d.tar.gz -SOURCES/libnetwork-da27c78.tar.gz -SOURCES/runc-b59a6bb.tar.gz -SOURCES/tini-4892d4d.tar.gz +SOURCES/docker-1faa135.tar.gz +SOURCES/libnetwork-0f08d31.tar.gz +SOURCES/runc-771c53e.tar.gz +SOURCES/tini-0effd37.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 93f6d0a..f229e7a 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 @@ -16,6 +17,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 5e5ef8e..5d7c780 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 28ae36d7df49e8ab36863fa6e61826c9df559a64 +%global commit_docker 1faa13545a16754001734593b5901db82756b55e %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1-rhel @@ -46,7 +46,7 @@ # docker-runc %global git_runc https://github.com/projectatomic/runc -%global commit_runc b59a6bb6e7278a3823f45691f82ac563bc083c9c +%global commit_runc 771c53eea0c8517e9edb02e7063f4b2e3ad72c57 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd @@ -56,17 +56,17 @@ # docker-init %global git_tini https://github.com/krallin/tini -%global commit_tini 4892d4dc7add670cede5640bd37a29ed0547e030 +%global commit_tini 0effd37412ba5ae7e00af0db1f36f5dbc1671df9 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork da27c78d6fc6f020675fc7eddfa48858112cfb34 +%global commit_libnetwork 0f08d31bf0e640e0cdc6d5161227f87602d605c5 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo}-latest Version: 1.13.1 -Release: 23.git%{shortcommit_docker}%{?dist} +Release: 26.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -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,17 +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/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} @@ -464,8 +464,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 %dir %{_sysconfdir}/%{name} @@ -516,6 +516,23 @@ exit 0 %endif # with_migrator %changelog +* Tue Sep 26 2017 Lokesh Mandvekar - 1.13.1-26.git1faa135 +- reverted sources, the same file shouldn't have a different hash + +* Tue Sep 26 2017 Lokesh Mandvekar - 1.13.1-25.git1faa135 +- built docker @projectatomic/docker-1.13.1-rhel commit 1faa135 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 771c53e +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 89a5d2c +- built docker-init commit 0effd37 +- built libnetwork commit 0f08d31 + +* Thu Sep 21 2017 Lokesh Mandvekar - 1.13.1-24.git1faa135 +- built docker @projectatomic/docker-1.13.1-rhel commit 1faa135 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 771c53e +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 89a5d2c +- built docker-init commit 0effd37 +- built libnetwork commit c34e58a + * Tue Aug 08 2017 Lokesh Mandvekar - 1.13.1-23.git28ae36d - built docker @projectatomic/docker-1.13.1-rhel commit 28ae36d - built docker-runc @projectatomic/docker-1.13.1-rhel commit b59a6bb