diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 81376eb..a5a20a2 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.service @@ -3,7 +3,6 @@ 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 @@ -17,7 +16,6 @@ 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 5ea3677..c037705 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 21f261c..c21e5e8 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -114,7 +114,7 @@ Requires(pre): selinux-policy >= %{selinux_policyver} Requires(pre): container-selinux >= %{docker_epoch}:%{docker_ver}-%{docker_rel} Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel} -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-1.8 Requires: oci-systemd-hook >= 1:0.1.4-4 @@ -190,9 +190,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} @@ -333,11 +333,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 @@ -459,8 +459,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} @@ -505,6 +505,9 @@ exit 0 %endif # with_migrator %changelog +* Wed Dec 14 2016 Johnny Hughes - 1.12.3-10 +- Manual CentOS Debranding + * Fri Nov 18 2016 Lokesh Mandvekar - 1.12.3-10 - depend on docker-common, container-selinux >= 2:1.10.3-58