Skip to content

Put pod binary into rpm and use it. #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tdawson wants to merge 1 commit into from
Closed

Put pod binary into rpm and use it. #1282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions openshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ Requires: tuned >= 2.3
%description -n tuned-profiles-openshift-node
%{summary}

%package pod
Summary: OpenShift Pod
Requires: openshift = %{version}-%{release}

%description pod
%{summary}


%prep
%setup -q
Expand Down Expand Up @@ -103,6 +110,11 @@ done
# set the IMAGES
sed -i 's|IMAGES=.*|IMAGES=%{docker_images}|' rel-eng/openshift-{master,node}.sysconfig

#Build our pod
pushd images/pod/
go build -ldflags "%{ldflags}" pod.go
popd

%install

install -d %{buildroot}%{_bindir}
Expand All @@ -111,6 +123,8 @@ do
echo "+++ INSTALLING ${bin}"
install -p -m 755 ${bin} %{buildroot}%{_bindir}/${bin}
done
#Install our pod
install -p -m 755 images/pod/pod %{buildroot}%{_bindir}/

install -d -m 0755 %{buildroot}%{_unitdir}
install -m 0644 -t %{buildroot}%{_unitdir} rel-eng/openshift-master.service
Expand Down Expand Up @@ -178,6 +192,10 @@ if [ "$1" = 0 ]; then
/usr/sbin/tuned-adm profile $recommended > /dev/null 2>&1
fi

%files pod
%defattr(-,root,root,-)
%{_bindir}/pod


%changelog
* Fri Feb 06 2015 Scott Dodson <[email protected]>
Expand Down