Skip to content
This repository has been archived by the owner on Oct 19, 2020. It is now read-only.

Commit

Permalink
Revert "MGMT-1318 - add annotations to BMH CRs that include data from…
Browse files Browse the repository at this point in the history
… bm-inve… (#12)"

This reverts commit 6e5205a.

Waiting till bm-inventory change is propagated...
  • Loading branch information
yevgeny-shnaidman committed Jul 26, 2020
1 parent 6e5205a commit 9e1c697
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 325 deletions.
21 changes: 5 additions & 16 deletions Dockerfile.ignition-manifests-and-kubeconfig-generate
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# [TODO] - remove this line, once we are ready to use openshift-installer from the release
FROM quay.io/ocpmetal/openshift-installer
# [TODO] - add someway to get oc client in order to use it to extract openshift-baremetal-install executable
# FROM quay.io/yshnaidm/oc-image:latest
FROM quay.io/ocpmetal/bm-inventory:latest AS inventory
FROM quay.io/yshnaidm/openshift-installer


FROM centos:8
RUN dnf install -y libvirt-libs python3 findutils && \
FROM fedora:31
RUN dnf install -y libvirt-libs pip python && \
yum clean all && \
rm -rf /var/cache/yum


COPY requirements.txt /tmp/requirements.txt
COPY --from=inventory /clients/bm-inventory-client-*.tar.gz /build/pip/
RUN pip3 install -r /tmp/requirements.txt
RUN pip3 install ipython
RUN find /build/pip/ -name 'setup.py' -exec dirname {} \; | xargs pip3 install
RUN pip install -r /tmp/requirements.txt

RUN rm /tmp/*requirements.txt

Expand All @@ -24,16 +18,11 @@ ARG WORK_DIR=/data
RUN mkdir $WORK_DIR
RUN chmod 777 $WORK_DIR

RUN mkdir /root/.docker

# [TODO] - change this line to use openshift-installer from the release, once we are ready
COPY --from=0 /root/installer/openshift-install $WORK_DIR
#COPY --from=0 /root/oc/oc $WORK_DIR
COPY ./render_files.py $WORK_DIR
COPY ./utils.py $WORK_DIR
COPY ./test_utils.py $WORK_DIR

ENV WORK_DIR=$WORK_DIR

ENV EXEC_PATH=$WORK_DIR/render_files.py
ENTRYPOINT python3 $EXEC_PATH
ENTRYPOINT python $EXEC_PATH
5 changes: 0 additions & 5 deletions Dockerfile.oc-image

This file was deleted.

129 changes: 0 additions & 129 deletions installer_dir/test_hosts_list.yaml

This file was deleted.

Loading

0 comments on commit 9e1c697

Please sign in to comment.