From 30b6aa6a257684a0c265123a85acd5714d4beefc Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jun 24 2016 00:18:13 +0000 Subject: Manual Debrand --- diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/docker.service b/SOURCES/docker.service index 98ae2e8..ab85e05 100644 --- a/SOURCES/docker.service +++ b/SOURCES/docker.service @@ -3,7 +3,6 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.com After=network.target Wants=docker-storage-setup.service -Requires=rhel-push-plugin.socket [Service] Type=notify @@ -13,7 +12,6 @@ EnvironmentFile=-/etc/sysconfig/docker-storage EnvironmentFile=-/etc/sysconfig/docker-network Environment=GOTRACEBACK=crash ExecStart=/bin/sh -c '/usr/bin/docker-current daemon \ - --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ $OPTIONS \ $DOCKER_STORAGE_OPTIONS \ diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig index 77bfe74..e227c17 100644 --- a/SOURCES/docker.sysconfig +++ b/SOURCES/docker.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.spec b/SPECS/docker.spec index 8d264cf..c4cf612 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -48,9 +48,9 @@ %global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) # rhel-push-plugin -%global git5 https://github.com/projectatomic/rhel-push-plugin -%global commit5 1a0046fc57606e329223748391d90284f2346565 -%global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) +#%global git5 https://github.com/projectatomic/rhel-push-plugin +#%global commit5 1a0046fc57606e329223748391d90284f2346565 +#%global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) # docker-lvm-plugin %global git6 https://github.com/projectatomic/%{repo}-lvm-plugin @@ -108,7 +108,7 @@ Source1: %{git1}/archive/%{commit1}/%{name}-selinux-%{shortcommit1}.tar.gz Source2: %{git2}/archive/%{commit2}/%{name}-storage-setup-%{shortcommit2}.tar.gz Source3: %{git3}/archive/%{commit3}/forward-journald-%{shortcommit3}.tar.gz Source4: %{git4}/archive/%{commit4}/%{name}-novolume-plugin-%{shortcommit4}.tar.gz -Source5: %{git5}/archive/%{commit5}/rhel-push-plugin-%{shortcommit5}.tar.gz +#Source5: %{git5}/archive/%{commit5}/rhel-push-plugin-%{shortcommit5}.tar.gz Source6: %{git6}/archive/%{commit6}/%{name}-lvm-plugin-%{shortcommit6}.tar.gz Source7: %{git7}/archive/%{commit7}/v1.10-migrator-%{shortcommit7}.tar.gz Source8: %{name}.service @@ -139,8 +139,8 @@ Requires(postun): systemd # need xz to work with ubuntu images Requires: xz Requires: device-mapper-libs >= 7:1.02.97 -Requires: subscription-manager -Requires: %{name}-rhel-push-plugin = %{version}-%{release} +#Requires: subscription-manager +#Requires: %{name}-rhel-push-plugin = %{version}-%{release} Requires: oci-register-machine = %{version}-%{release} Requires: oci-systemd-hook = %{version}-%{release} Provides: lxc-%{name} = %{version}-%{release} @@ -246,16 +246,16 @@ local volumes defined. In particular, the plugin will block `docker run` with: The only thing allowed will be just bind mounts. -%package rhel-push-plugin -License: GPLv2 -Summary: Avoids pushing a RHEL-based image to docker.io registry +#%package rhel-push-plugin +#License: GPLv2 +#Summary: Avoids pushing a RHEL-based image to docker.io registry -%description 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 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 lvm-plugin License: LGPLv3 @@ -319,7 +319,7 @@ tar zxf %{SOURCE3} tar zxf %{SOURCE4} # untar rhel-push-plugin -tar zxf %{SOURCE5} +#tar zxf %{SOURCE5} # untar lvm-plugin tar zxf %{SOURCE6} @@ -369,7 +369,7 @@ pushd _build ln -s $(dirs +1 -l) src/%{import_path} ln -s $(dirs +1 -l)/forward-journald-%{commit3} src/%{provider}.%{provider_tld}/projectatomic/forward-journald ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit4} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin - ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit5} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin +# ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit5} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit6} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin ln -s $(dirs +1 -l)/oci-register-machine-%{commit16} src/%{provider}.%{provider_tld}/projectatomic/oci-register-machine ln -s $(dirs +1 -l)/oci-systemd-hook-%{commit17} src/%{provider}.%{provider_tld}/projectatomic/oci-systemd-hook @@ -380,13 +380,13 @@ export DOCKER_BUILDTAGS='selinux seccomp' export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} export GOPATH=$GOPATH:$(pwd)/_build:$(pwd)/forward-journald-%{commit3}/vendor export GOPATH=$GOPATH:$(pwd)/%{repo}-novolume-plugin-%{commit4}/Godeps/_workspace -export GOPATH=$GOPATH:$(pwd)/rhel-push-plugin-%{commit5}/Godeps/_workspace +#export GOPATH=$GOPATH:$(pwd)/rhel-push-plugin-%{commit5}/Godeps/_workspace export GOPATH=$GOPATH:$(pwd)/%{repo}-lvm-plugin-%{commit6}/vendor # build %%{name} manpages man/md2man-all.sh go-md2man -in %{repo}-novolume-plugin-%{commit4}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8 -go-md2man -in rhel-push-plugin-%{commit5}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8 +#go-md2man -in rhel-push-plugin-%{commit5}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8 go-md2man -in %{repo}-lvm-plugin-%{commit6}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8 # build %%{name} binary @@ -403,7 +403,7 @@ popd pushd $(pwd)/_build/src go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{provider}.%{provider_tld}/projectatomic/forward-journald go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin -go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin +#go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" %{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin popd @@ -513,16 +513,17 @@ rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{na # remove %%{name}-selinux rpm spec file rm -rf %{name}-selinux-%{commit1}/%{name}-selinux.spec -# install secrets dir -install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +# don't install secrets dir +# 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}/etc/%{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}/etc/%{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}/etc/%{name}/certs.d # install %%{name} config directory install -dp %{buildroot}%{_sysconfdir}/%{name}/ @@ -558,12 +559,12 @@ 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 +#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} @@ -649,8 +650,8 @@ fi %{_mandir}/man5/*.5.gz %{_mandir}/man8/%{name}-daemon.8.gz %{_bindir}/%{name}-* -%dir %{_datadir}/rhel -%{_datadir}/rhel/* +#%dir %{_datadir}/rhel +#%{_datadir}/rhel/* %{_unitdir}/%{name}.service %{_unitdir}/%{name}-storage-setup.service %{_datadir}/bash-completion/completions/%{name} @@ -699,12 +700,12 @@ fi %{_libexecdir}/%{repo}/%{repo}-novolume-plugin %{_unitdir}/%{repo}-novolume-plugin.* -%files 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 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 lvm-plugin %license %{repo}-lvm-plugin-%{commit6}/LICENSE @@ -737,6 +738,9 @@ fi %dir %{_libexecdir}/oci/hooks.d %changelog +* Thu Jun 23 2016 Johnny Hughes 1.10.3-44 +- Manual Debranding + * Fri Jun 17 2016 Lokesh Mandvekar - 1.10.3-44 - Resolves: #1311544 (bz added, no other change since -43)