Skip to content
This repository was archived by the owner on Oct 3, 2019. It is now read-only.

Use the base image available in the OpenShift CI #175

Merged
baijum merged 2 commits into from
May 2, 2019
Merged

Use the base image available in the OpenShift CI #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48ad0a4
Use the base available in the OpenShift CI
baijum May 2, 2019
697d406
Remove option to set image as an argument
baijum May 2, 2019
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
13 changes: 1 addition & 12 deletions openshift-ci/Dockerfile.registry.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,10 @@ ARG version=0.1.0

COPY manifests manifests
COPY deploy/crds/*.yaml manifests/devconsole/${version}/
RUN curl -L -s https://github.com/devconsole-operator-test-deps/operator-registry-binaries/releases/download/v0.1.0/appregistry-server -o /bin/appregistry-server \
Copy link
Member

@sbose78 sbose78 May 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep only these changes and have this PR merged?

Copy link
Collaborator Author

@baijum baijum May 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. 697d406

&& chmod +x /bin/appregistry-server
RUN curl -L -s https://github.com/devconsole-operator-test-deps/operator-registry-binaries/releases/download/v0.1.0/configmap-server -o /bin/configmap-server \
&& chmod +x /bin/configmap-server
RUN curl -L -s https://github.com/devconsole-operator-test-deps/operator-registry-binaries/releases/download/v0.1.0/registry-server -o /bin/registry-server \
&& chmod +x /bin/registry-server
RUN curl -L -s https://github.com/devconsole-operator-test-deps/operator-registry-binaries/releases/download/v0.1.0/initializer -o /bin/initializer \
&& chmod +x /bin/initializer
RUN curl -L -s https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.2.2/grpc_health_probe-linux-amd64 -o /bin/grpc_health_probe \
&& chmod +x /bin/grpc_health_probe

RUN sed -e "s,REPLACE_IMAGE,registry.svc.ci.openshift.org/${OPENSHIFT_BUILD_NAMESPACE}/stable:devconsole-operator," -i manifests/devconsole/${version}/devconsole-operator.v${version}.clusterserviceversion.yaml

RUN initializer
USER 1001

USER 1001
EXPOSE 50051
CMD ["registry-server"]