revised Dockerfile to have more args

Docker/shellb3-cspp-py36.Dockerfile → Docker/Dockerfile

-# docker build . -f shellb3-cspp-py36.Dockerfile -t shellb3-cspp-py36:latest
+# docker build . --build-arg TRIM=cspp --build-arg PYTHON_VERSION=36 -f Dockerfile -t shellb3-cspp-py36:latest
 # docker run -e SHELLB3_ARCHIVE_DIR=/dock -it --rm -v $HOME/dock:/dock -w /opt/shellb3-cspp-py36/ShellB3 shellb3-cspp-py36 /bin/bash -l -c "unset LANG; bash shallbethree.sh bin_dist"
 FROM centos:6
 RUN yum -y install gcc-gfortran gcc-c++ unzip perl patch byacc bison flex glibc-devel.i686 glibc-devel.x86_64 xz epel-release 
@@ -11,16 +11,16 @@ RUN yum -y install git wget perl-TermReadKey \
 RUN test -d /opt || mkdir /opt
 RUN test -d /work || mkdir /work
 ARG BORT=develop
-RUN cd /opt && git clone https://gitlab.ssec.wisc.edu/rayg/ShellB3.git --branch ${BORT} --single-branch --depth 1 shellb3-cspp-py36
-RUN ln -s shellb3-cspp-py36/ShellB3 /opt/ShellB3
-RUN ln -s /opt/shellb3-cspp-py36 /work/ShellB3
-ENV MAKEFLAGS=-j12
 # was 37 originally but changed back due to ssl 1.0.2 constraint
 ARG PYTHON_VERSION=36
+ARG TRIM=cspp
+RUN cd /opt && git clone https://gitlab.ssec.wisc.edu/rayg/ShellB3.git --branch ${BORT} --single-branch --depth 1 shellb3-${TRIM}-py${PYTHON_VERSION}
+RUN ln -s shellb3-${TRIM}-py${PYTHON_VERSION}/ShellB3 /opt/ShellB3
+RUN ln -s /opt/shellb3-${TRIM}-py${PYTHON_VERSION} /work/ShellB3
+ENV MAKEFLAGS=-j12
 ARG LINUXCPUFLAGS="-msse2 -fPIC"
-WORKDIR /opt/shellb3-cspp-py36/ShellB3 
+WORKDIR /opt/shellb3-${TRIM}-py${PYTHON_VERSION}/ShellB3 
 RUN bash -e shallbethree.sh mk_gcc7 
-ARG SB3_TRIM=cspp
-RUN bash -e shallbethree.sh mk_${SB3_TRIM}
+RUN bash -e shallbethree.sh mk_${TRIM}
 WORKDIR /work
-RUN echo export HOSTNAME=$(perl -ne '/.*"HOSTNAME": "(\w+)",/ && print "$1";' </opt/shellb3-cspp-py36/ShellB3/build/.build_env.json) >/etc/profile.d/99-build-host.sh
+RUN echo export HOSTNAME=$(perl -ne '/.*"HOSTNAME": "(\w+)",/ && print "$1";' </opt/shellb3-${TRIM}-py${PYTHON_VERSION}/ShellB3/build/.build_env.json) >/etc/profile.d/99-build-host.sh