diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index c468d26..2e238b9 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.service @@ -1,9 +1,8 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target rhel-push-plugin.socket registries.service +After=network.target Wants=docker-latest-storage-setup.service -Requires=rhel-push-plugin.socket registries.service [Service] Type=notify @@ -18,7 +17,6 @@ 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 \ --init-path=/usr/libexec/docker/docker-init-latest \ diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index 9aec8dd..4e94c2b 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -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} @@ -344,17 +344,18 @@ 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 +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/ # install systemd/init scripts install -d %{buildroot}%{_unitdir} @@ -470,14 +471,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 @@ -522,6 +523,9 @@ exit 0 %endif # with_migrator %changelog +* Fri May 11 2018 Johnny Hughes - 1.13.1-58.git87f2fab +- Manual CentOS Debranding + * Mon Mar 19 2018 Lokesh Mandvekar - 1.13.1-58.git87f2fab - built docker @projectatomic/docker-1.13.1-rhel commit 87f2fab - built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b