From 88ddf39559c369d57fac6026a5b433b9a933ade4 Mon Sep 17 00:00:00 2001 From: "R.K.Garcia" <rayg@ssec.wisc.edu> Date: Fri, 30 Jul 2021 20:46:49 +0000 Subject: [PATCH] minor Dockerfile updates and rename --- Docker/{shellb3-cspp-py38.Dockerfile => Dockerfile} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Docker/{shellb3-cspp-py38.Dockerfile => Dockerfile} (81%) diff --git a/Docker/shellb3-cspp-py38.Dockerfile b/Docker/Dockerfile similarity index 81% rename from Docker/shellb3-cspp-py38.Dockerfile rename to Docker/Dockerfile index 4b7e9edd..4fca7c70 100644 --- a/Docker/shellb3-cspp-py38.Dockerfile +++ b/Docker/Dockerfile @@ -1,11 +1,11 @@ -# docker build --build-arg BORT=develop . -f shellb3-cspp-py38.Dockerfile -t shellb3-cspp-py38:latest -# docker run -e SHELLB3_ARCHIVE_DIR=/dock -it --rm -v $HOME/dock:/dock -w /opt/shellb3-cspp-py38/ShellB3 shellb3-cspp-py38 /bin/bash -l -c "unset LANG; bash shallbethree.sh bin_dist" +# docker build --build-arg BORT=dev --build-arg TRIM=cspp --build-arg PYTHON_VERSION=38 . -f Dockerfile -t shellb3-dev-cspp-py38:latest +# docker run -e SHELLB3_ARCHIVE_DIR=/dock -it --rm -v $HOME/dock:/dock -w /opt/shellb3-cspp-py38/ShellB3 shellb3-dev-cspp-py38 /bin/bash -l -c "unset LANG; bash shallbethree.sh bin_dist" FROM centos:7 RUN yum -y install gcc-gfortran gcc-c++ unzip perl patch byacc bison flex glibc-devel.i686 glibc-devel.x86_64 xz epel-release wget make bzip2 xz automake autoconf m4 which RUN yum -y install git git-lfs RUN test -d /opt || mkdir /opt RUN test -d /work || mkdir /work -ARG BORT +ARG BORT=main ARG TRIM=cspp RUN cd /opt && echo "using branch or tag ${BORT}" \ && git clone https://gitlab.ssec.wisc.edu/rayg/ShellB3.git --branch ${BORT} --single-branch --depth 1 shellb3-cspp-py38 -- GitLab