diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig index 480d931..eb3cf96 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 115861b..ab72df1 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -174,16 +174,16 @@ local volumes defined. In particular, the plugin will block `docker run` with: The only thing allowed will be just bind mounts. -%package -n %{repo}-rhel-push-plugin -License: GPLv2 -Summary: Avoids pushing a RHEL-based image to docker.io registry +# %package -n %{repo}-rhel-push-plugin +# License: GPLv2 +# Summary: Avoids pushing a RHEL-based image to docker.io registry -%description -n %{repo}-rhel-push-plugin -In order to use this plugin you must be running at least Docker 1.10 which -has support for authorization plugins. +# %description -n %{repo}-rhel-push-plugin +# In order to use this plugin you must be running at least Docker 1.10 which +# has support for authorization plugins. -This plugin avoids any RHEL based image to be pushed to the default docker.io -registry preventing users to violate the RH subscription agreement. +# This plugin avoids any RHEL based image to be pushed to the default docker.io +# registry preventing users to violate the RH subscription agreement. %package -n %{repo}-lvm-plugin License: LGPLv3 @@ -353,16 +353,16 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name} # install storage dir install -d %{buildroot}%{_sharedstatedir}/%{name} -# install secret patch directory -install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +# don't install secret patch directory +#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 -ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt +#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 +#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt # install systemd/init scripts install -d %{buildroot}%{_unitdir} @@ -375,13 +375,13 @@ install -p -m 644 %{repo}-novolume-plugin-%{commit4}/systemd/%{repo}-novolume-pl install -d %{buildroot}%{_mandir}/man8 install -p -m 644 %{repo}-novolume-plugin.8 %{buildroot}%{_mandir}/man8 -# install rhel-push-plugin executable, unitfile, socket and man -install -d %{buildroot}%{_libexecdir}/%{repo} -install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin -install -p -m 644 rhel-push-plugin-%{commit5}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service -install -p -m 644 rhel-push-plugin-%{commit5}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket -install -d %{buildroot}%{_mandir}/man8 -install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8 +# don't install rhel-push-plugin executable, unitfile, socket and man +# install -d %{buildroot}%{_libexecdir}/%{repo} +#install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin +#install -p -m 644 rhel-push-plugin-%{commit5}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service +#install -p -m 644 rhel-push-plugin-%{commit5}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket +#install -d %{buildroot}%{_mandir}/man8 +#install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8 # install %%{repo}-lvm-plugin executable, unitfile, socket and man install -d %{buildroot}/%{_libexecdir}/%{repo} @@ -482,8 +482,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} @@ -520,12 +520,12 @@ exit 0 %{_libexecdir}/%{repo}/%{repo}-novolume-plugin %{_unitdir}/%{repo}-novolume-plugin.* -%files -n %{repo}-rhel-push-plugin -%license rhel-push-plugin-%{commit5}/LICENSE -%doc rhel-push-plugin-%{commit5}/README.md -%{_mandir}/man8/rhel-push-plugin.8.gz -%{_libexecdir}/%{repo}/rhel-push-plugin -%{_unitdir}/rhel-push-plugin.* +#%files -n %{repo}-rhel-push-plugin +#%license rhel-push-plugin-%{commit5}/LICENSE +#%doc rhel-push-plugin-%{commit5}/README.md +#%{_mandir}/man8/rhel-push-plugin.8.gz +#%{_libexecdir}/%{repo}/rhel-push-plugin +#%{_unitdir}/rhel-push-plugin.* %files -n %{repo}-lvm-plugin %license %{repo}-lvm-plugin-%{commit6}/LICENSE @@ -541,6 +541,9 @@ exit 0 %{_bindir}/v1.10-migrator-local %changelog +* Mon May 16 2016 Johnny Hughes - 1.10.3-22 +- Manual CentOS Debranding + * Tue May 03 2016 Lokesh Mandvekar - 1.10.3-22 - Resolves: #1328588, ship /etc/docker/docker-lvm-plugin config file - Resolves: #1333123, include ADD_REGISTRY and BLOCK_REGISTRY variables in