From f6e7dedd4a94436218f56188a1528c9bf81a17f7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 14:08:27 +0000 Subject: import docker-latest-1.12.1-3.el7 --- diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index a5a20a2..81376eb 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.service @@ -3,6 +3,7 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.com 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 \ --default-runtime=docker-runc \ + --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ -g /var/lib/docker-latest \ $OPTIONS \ diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig index c037705..5ea3677 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 4d62d63..394122c 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -56,12 +56,12 @@ %if 0%{?fedora} >= 22 %global selinux_policyver 3.13.1-119 %else -%global selinux_policyver 3.13.1-23 +%global selinux_policyver 3.13.1-97 %endif Name: %{repo}-latest Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -96,11 +96,11 @@ Requires(pre): selinux-policy >= %{selinux_policyver} # macros for 'docker' package VR %global docker_ver 1.10.3 -%global docker_rel 46%{?dist}.12 +%global docker_rel 53 -Requires: %{repo}-selinux >= %{docker_ver}-%{docker_rel} +Requires(pre): %{repo}-selinux >= %{docker_ver}-%{docker_rel} Requires: %{repo}-common >= %{docker_ver}-%{docker_rel} -#Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel} +Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel} Requires: oci-register-machine >= 1:0-1.8 Requires: oci-systemd-hook >= 1:0.1.4-4 @@ -171,9 +171,9 @@ running and skip checksum calculation on startup. 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} @@ -306,11 +306,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 @@ -428,8 +428,8 @@ exit 0 %{_unitdir}/%{name}.service %{_unitdir}/%{name}-storage-setup.service %{_datadir}/bash-completion/completions/%{name} -#%dir %{_datadir}/rhel -#%{_datadir}/rhel/* +%dir %{_datadir}/rhel +%{_datadir}/rhel/* %dir %{_sharedstatedir}/%{name} %{_udevrulesdir}/80-%{name}.rules %{_sysconfdir}/%{name} @@ -452,7 +452,7 @@ exit 0 %if 0%{?with_devel} %files devel %license LICENSE -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README.md +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %{gopath}/src/%{import_path} %endif @@ -472,12 +472,12 @@ exit 0 %{_bindir}/%{name}-v1.10-migrator-* %changelog -* Fri Sep 16 2016 Johnny Hughes - 1.12.1-2 -- Manual CentOS Debranding +* Wed Sep 07 2016 Lokesh Mandvekar - 1.12.1-3 +- Resolves: #1373969 - rebuild for 7.3 +- use docker-common >= 1.10-3-53 and selinux-policy >= 3.13.1-97 * Mon Aug 29 2016 Lokesh Mandvekar - 1.12.1-2 -- Resolves: #1368284 -- adding bz for references, no change in commits used +- Resolves: #1368284 - adding bz for references, no change in commits used * Mon Aug 29 2016 Lokesh Mandvekar - 1.12.1-1 - Resolves: #1371266