From 2d95a4e4c13ed885f8a95ad68d6749ce99c40fba Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: May 01 2019 14:43:20 +0000 Subject: Manual CentOS Branding --- diff --git a/SOURCES/docker.service b/SOURCES/docker.service index 535487c..e67f0d2 100644 --- a/SOURCES/docker.service +++ b/SOURCES/docker.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-storage-setup.service -Requires=rhel-push-plugin.socket registries.service Requires=docker-cleanup.timer [Service] @@ -19,7 +18,6 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin ExecStart=/usr/bin/dockerd-current \ --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \ --default-runtime=docker-runc \ - --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \ --init-path=/usr/libexec/docker/docker-init-current \ diff --git a/SPECS/docker.spec b/SPECS/docker.spec index 8ca0b3c..12f4870 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -45,9 +45,9 @@ %global shortcommit_novolume %(c=%{commit_novolume}; echo ${c:0:7}) # rhel-push-plugin -%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin -%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d -%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7}) +#%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin +#%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d +#%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7}) # docker-lvm-plugin %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin @@ -81,11 +81,11 @@ Release: 96.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 %{ix86} Source0: %{git_docker}/archive/%{commit_docker}.tar.gz Source2: %{git_dss}/archive/%{commit_dss}/container-storage-setup-%{shortcommit_dss}.tar.gz Source4: %{git_novolume}/archive/%{commit_novolume}/%{repo}-novolume-plugin-%{shortcommit_novolume}.tar.gz -Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz +#Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz Source6: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz Source8: %{name}.service Source9: %{name}.sysconfig @@ -113,7 +113,7 @@ BuildRequires: cmake BuildRequires: sed BuildRequires: git BuildRequires: glibc-static -%if 0%{?fedora} || 0%{?centos} +%if 0%{?fedora} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %else BuildRequires: go-toolset-1.10 @@ -187,7 +187,7 @@ Requires: device-mapper-libs >= 7:1.02.97 Requires: oci-umount >= 2:2.3.3-3 Requires: oci-register-machine >= 1:0-5.13 Requires: oci-systemd-hook >= 1:0.1.4-9 -Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release} +#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release} Requires: xz Requires: atomic-registries Requires: container-selinux >= 2:2.51-1 @@ -239,16 +239,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 @@ -273,7 +273,7 @@ tar zxf %{SOURCE2} tar zxf %{SOURCE4} # untar rhel-push-plugin -tar zxf %{SOURCE5} +#tar zxf %{SOURCE5} # untar lvm-plugin tar zxf %{SOURCE6} @@ -332,7 +332,7 @@ pushd _build mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic} ln -s $(dirs +1 -l) src/%{import_path} ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit_novolume} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin - ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin +# ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin popd @@ -341,10 +341,10 @@ pushd $(pwd)/_build/src %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin popd -export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build -pushd $(pwd)/_build/src -%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin -popd +#export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build +#pushd $(pwd)/_build/src +#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin +#popd export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/Godeps/_workspace:$(pwd)/_build pushd $(pwd)/_build/src @@ -367,7 +367,7 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor # build %%{name} manpages man/md2man-all.sh go-md2man -in %{repo}-novolume-plugin-%{commit_novolume}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8 -go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8 +#go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8 go-md2man -in %{repo}-lvm-plugin-%{commit_lvm}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8 # build %%{name} binary @@ -532,12 +532,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-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service -install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/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-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service +#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/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} @@ -617,14 +617,14 @@ exit 0 %postun novolume-plugin %systemd_postun_with_restart %{name}-novolume-plugin.service -%post rhel-push-plugin -%systemd_post rhel-push-plugin.service +#%post rhel-push-plugin +#%systemd_post rhel-push-plugin.service -%preun rhel-push-plugin -%systemd_preun rhel-push-plugin.service +#%preun rhel-push-plugin +#%systemd_preun rhel-push-plugin.service -%postun rhel-push-plugin -%systemd_postun_with_restart rhel-push-plugin.service +#%postun rhel-push-plugin +#%systemd_postun_with_restart rhel-push-plugin.service %posttrans # Install a default docker-storage-setup based on kernel version. @@ -720,12 +720,12 @@ fi %{_libexecdir}/%{repo}/%{repo}-novolume-plugin %{_unitdir}/%{repo}-novolume-plugin.* -%files rhel-push-plugin -%license rhel-push-plugin-%{commit_rhel_push}/LICENSE -%doc rhel-push-plugin-%{commit_rhel_push}/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-%{commit_rhel_push}/LICENSE +#%doc rhel-push-plugin-%{commit_rhel_push}/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-%{commit_lvm}/LICENSE @@ -741,6 +741,9 @@ fi %{_bindir}/%{name}-v1.10-migrator-* %changelog +* Wed May 01 2019 Johnny Hughes - 2:1.13.1-96.gitb2f74b2 +- Manual CentOS Debranding + * Tue Apr 02 2019 Lokesh Mandvekar - 2:1.13.1-96.gitb2f74b2 - Resolves: #1695305 - built docker-runc @projectatomic/docker-1.13.1-rhel commit 9c3c5f8