Merge pull request #119 from bradmwilliams/image_updates

bradmwilliams · web-flow · commit 9f17651227d4 · 2022-09-14T15:34:52.000-04:00
Adding support for Openshift CI
diff --git a/OWNERS b/OWNERS
@@ -0,0 +1,6 @@
+approvers:
+- jupierce
+- bradmwilliams
+reviewers:
+- jupierce
+- bradmwilliams
diff --git a/ansible/roles/openshift_client_python/library/openshift_client_python.py b/ansible/roles/openshift_client_python/library/openshift_client_python.py
diff --git a/doctoc.sh b/doctoc.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-doctoc --github readme.md
+doctoc --github README.md
 
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -0,0 +1,15 @@
+FROM registry.ci.openshift.org/ocp/4.12:cli as cli
+
+FROM registry.ci.openshift.org/origin/centos:stream8
+LABEL maintainer="brawilli@redhat.com"
+
+COPY --from=cli /usr/bin/oc /usr/bin/
+
+ADD . /openshift-client-python
+
+RUN yum install -y python2 python3 git && python2 -m pip install --upgrade pip && python2 -m pip install -r /openshift-client-python/requirements.txt && python3 -m pip install --upgrade pip && python3 -m pip install -r /openshift-client-python/requirements.txt 
+
+ENV PYTHONPATH=/openshift-client-python/packages:$PYTHONPATH
+ENV PYTHONUNBUFFERED=1
+
+ENTRYPOINT /usr/bin/bash
diff --git a/images/monitoring.Dockerfile b/images/monitoring.Dockerfile
diff --git a/run_unittests.sh b/run_unittests.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-export PYTHONPATH="$(pwd)/packages"
-cd $(pwd)/packages
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]:-$0}")
+
+export PYTHONPATH="${SCRIPT_ROOT}/packages"
+cd ${SCRIPT_ROOT}/packages
 python2 -m unittest discover
 python3 -m unittest discover
