Skip to content
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

Jump to bottom

Create template-service-broker subpackage and image #16638

Merged
merged 2 commits into from
Oct 10, 2017
Merged

Create template-service-broker subpackage and image #16638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08836c5
Create template-service-broker subpackage
sdodson Sep 29, 2017
7e01869
Add template-service-broker image
sdodson Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions hack/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}"
( os::build::image "${tag_prefix}-pod" images/pod ) &
( os::build::image "${tag_prefix}-cluster-capacity" images/cluster-capacity ) &
( os::build::image "${tag_prefix}-service-catalog" images/service-catalog ) &
( os::build::image "${tag_prefix}-template-service-broker" images/template-service-broker ) &


for i in `jobs -p`; do wait $i; done

Expand Down
1 change: 1 addition & 0 deletions hack/push-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ images=(
openshift/origin-gitserver
openshift/origin-cluster-capacity
openshift/origin-service-catalog
openshift/origin-template-service-broker
openshift/hello-openshift
openshift/openvswitch
openshift/node
Expand Down
1 change: 1 addition & 0 deletions images/template-service-broker/.cccp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-id: origin-template-service-broker
8 changes: 8 additions & 0 deletions images/template-service-broker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM openshift/origin-source

RUN INSTALL_PKGS="origin-template-service-broker" && \
yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
rpm -V ${INSTALL_PKGS} && \
yum clean all

CMD [ "/usr/bin/template-service-broker" ]
5 changes: 5 additions & 0 deletions images/template-service-broker/OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
reviewers:
- jminter
- deads
approvers:
- jminter
10 changes: 9 additions & 1 deletion origin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ Summary: %{product_name} Service Catalog
%description service-catalog
%{summary}

%package template-service-broker
Summary: Template Service Broker
%description template-service-broker
%{summary}

%package cluster-capacity
Summary: %{product_name} Cluster Capacity Analysis Tool

Expand Down Expand Up @@ -264,7 +269,7 @@ PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
install -d %{buildroot}%{_bindir}

# Install linux components
for bin in oc openshift dockerregistry kubefed
for bin in oc openshift dockerregistry kubefed template-service-broker
do
echo "+++ INSTALLING ${bin}"
install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin}
Expand Down Expand Up @@ -617,6 +622,9 @@ fi
%{_bindir}/hypercc
%{_bindir}/cluster-capacity

%files template-service-broker
%{_bindir}/template-service-broker


%pretrans docker-excluder
# we always want to clear this out using the last
Expand Down