dockerfile cleanup

Dockerfile

@@ -4,18 +4,30 @@ LABEL maintainer="James Cherry <[email protected]>"
 
 # Install dev and runtime dependencies
 RUN yum group install -y "Development Tools" \
-    && yum install -y https://centos7.iuscommunity.org/ius-release.rpm \
-    && yum install -y wget git centos-release-scl devtoolset-8 \
+    && yum install -y https://repo.ius.io/ius-release-el7.rpm \
+    && yum install -y centos-release-scl \
+    && yum install -y wget devtoolset-8 \
+    && yum install -y qt5-qtbase-devel \
     devtoolset-8-libatomic-devel tcl-devel tcl tk libstdc++ tk-devel pcre-devel \
+    python36u python36u-libs python36u-devel python36u-pip && \
     yum clean -y all && \
     rm -rf /var/lib/apt/lists/*
 
+ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc \
+    CPP=/opt/rh/devtoolset-8/root/usr/bin/cpp \
+    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
+    PATH=/opt/rh/devtoolset-8/root/usr/bin:$PATH \
+    LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:$LD_LIBRARY_PATH
+
 # Install CMake
 RUN wget https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh && \
     chmod +x cmake-3.14.0-Linux-x86_64.sh  && \
     ./cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr/local && rm -rf cmake-3.14.0-Linux-x86_64.sh \
     && yum clean -y all
 
+# Install any git version > 2.6.5
+RUN yum remove -y git* && yum install -y git224
+
 # Install SWIG
 RUN yum remove -y swig \
     && wget https://github.com/swig/swig/archive/rel-4.0.1.tar.gz \
@@ -48,7 +60,7 @@ WORKDIR /OpenSTA
 RUN mkdir build
 #RUN cd buld && cmake .. -DCUDD=$HOME/cudd
 RUN cd build && cmake ..
-RUN make -j 4
+RUN make -j 8
 
 # Run sta on entry
 ENTRYPOINT ["OpenSTA/app/sta"]

jenkins/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -x
 set -e
-docker build -t openroad/opensta --target base-dependencies .
-docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd):/OpenSTA openroad/opensta bash -c "./OpenSTA/jenkins/install.sh"
+cmake -B build .
+cmake --build build -j 8