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

Remove oc to slim down the image #12

Merged
merged 2 commits into from
Mar 17, 2022
Merged

Remove oc to slim down the image #12

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
8b14a9a
Delete the osd-cluster-ready pod in the openshift-monitoring namespace
mjlshen Mar 17, 2022
35375ed
oc no longer needed due to PR #7
mjlshen Mar 17, 2022
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: 2 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
FROM registry.access.redhat.com/ubi8/ubi-micro:latest

RUN microdnf install \
gzip \
jq \
tar \
wget

ADD dockerbuild /root/build
RUN /root/build/install-oc.sh

ADD bin/main /root/main
COPY bin/main /root/main
12 changes: 0 additions & 12 deletions dockerbuild/install-oc.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hack/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if [[ $WAIT_FOR_POD == "yes" ]]; then
# - Timeout, in which case we want to blow up.
# - The pod already disappeared, in which case we want to proceed.
# Scraping the output is icky. For now, just ignore errors.
maybe oc wait --for=delete pod -l job-name=osd-cluster-ready --timeout=30s || true
maybe oc wait --for=delete pod -n openshift-monitoring -l job-name=osd-cluster-ready --timeout=30s || true
fi

maybe oc create -f $TMP_MANIFEST
Expand Down