Merge pull request #46 from JoshuaSBrown/development

Development

scripts/docker_clean.bash

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Will remove all docker containers and images
+docker container prune
+docker image prune -a

scripts/release.bash

@@ -3,12 +3,13 @@
 directory=$(pwd)
 distros="centos7 fedora28 ubuntu18 debian9"
 for distro in $distros; do
+  echo "Building ${distro}"
   cd ${directory}/release_distros/${distro}
   pwd
   ls
   cp ${directory}/release_distros/package_release.bash ${directory}/release_distros/${distro}/
-  docker build ${directory}/release_distros/${distro} -t catnip${distro}
-  id=$(docker create catnip${distro})
+  docker build ${directory}/release_distros/${distro} -t "catnip${distro}"
+  id=$(docker create "catnip${distro}")
   docker cp $id:TAR .
   rm ${directory}/release_distros/${distro}/package_release.bash
 done

scripts/release_distros/centos7/Dockerfile

@@ -1,7 +1,7 @@
 FROM centos:7
 
 RUN yum update -y
-RUN yum install make cmake gcc-c++ git file redhat-lsb-core -y
+RUN yum install python curl unzip zip make cmake gcc-c++ git file redhat-lsb-core -y
 RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
 RUN chmod +x get-pip.py
 RUN ./get-pip.py
@@ -10,12 +10,12 @@ RUN git clone https://github.com/JoshuaSBrown/QC_Tools.git
 RUN mkdir -p QC_Tools/build_test
 RUN mkdir -p QC_Tools/build
 # Build with tests and then test
-WORKDIR /QC_Tools/build_test
+WORKDIR /QC_Tools/build
 RUN cmake -DENABLE_TESTS=ON -DENABLE_INTEGRATION_TESTS=ON ../ 
 RUN make
-RUN make test
+RUN make ARGS="-V" test
 # Build optimized release version
-WORKDIR /QC_Tools/build
+RUN rm -rf *
 RUN cmake -DCMAKE_BUILD_TYPE=Release ../
 RUN make
 # VERSION of calc_J                                                             

scripts/release_distros/debian9/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:stretch
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && apt-get install -y apt-utils ca-certificates make cmake gcc g++ git file lsb-release && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y python curl bc zip unzip apt-utils ca-certificates make cmake gcc g++ git file lsb-release && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"                 
 RUN chmod +x get-pip.py                                                         
 RUN ./get-pip.py                                                                
@@ -11,12 +11,12 @@ RUN mkdir -p QC_Tools/build_test
 RUN mkdir -p QC_Tools/build
 
 # Build with tests and then test
-WORKDIR /QC_Tools/build_test
+WORKDIR /QC_Tools/build
 RUN cmake -DENABLE_TESTS=ON -DENABLE_INTEGRATION_TESTS=ON ../
 RUN make
-RUN make test
+RUN make ARGS="-V" test
 # Build optimized release version
-WORKDIR /QC_Tools/build
+RUN rm -rf *
 RUN cmake -DCMAKE_BUILD_TYPE=Release ../
 RUN make
 # VERSION of calc_J                                                             

scripts/release_distros/fedora28/Dockerfile

@@ -1,6 +1,6 @@
 FROM fedora:28
 
-RUN dnf install make cmake gcc-c++ git file redhat-lsb-core -y
+RUN dnf install python curl zip unzip make cmake gcc-c++ git file redhat-lsb-core -y
 RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"                 
 RUN chmod +x get-pip.py                                                         
 RUN ./get-pip.py                                                                
@@ -9,12 +9,12 @@ RUN git clone https://github.com/JoshuaSBrown/QC_Tools.git
 RUN mkdir -p QC_Tools/build_test
 RUN mkdir -p QC_Tools/build
 # Build with tests and then test
-WORKDIR /QC_Tools/build_test
+WORKDIR /QC_Tools/build
 RUN cmake -DENABLE_TESTS=ON -DENABLE_INTEGRATION_TESTS=ON ../
 RUN make
-RUN make test
+RUN make ARGS="-V" test
 # Build optimized release version
-WORKDIR /QC_Tools/build
+RUN rm -rf *
 RUN cmake -DCMAKE_BUILD_TYPE=Release ../
 RUN make
 # VERSION of calc_J                                                             

scripts/release_distros/ubuntu18/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:bionic
 
-RUN apt-get update && apt-get install -y apt-utils ca-certificates make cmake gcc g++ git file lsb-release && apt-get clean &&  rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y bc python curl zip unzip apt-utils ca-certificates make cmake gcc g++ git file lsb-release && apt-get clean &&  rm -rf /var/lib/apt/lists/*
 RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"                 
 RUN chmod +x get-pip.py                                                         
 RUN ./get-pip.py                                                                
@@ -9,12 +9,12 @@ RUN git clone https://github.com/JoshuaSBrown/QC_Tools.git
 RUN mkdir -p QC_Tools/build_test
 RUN mkdir -p QC_Tools/build
 # Build with tests and then test
-WORKDIR /QC_Tools/build_test
+WORKDIR /QC_Tools/build
 RUN cmake -DENABLE_TESTS=ON -DENABLE_INTEGRATION_TESTS=ON ../
 RUN make
-RUN make test
+RUN make ARGS="-V" test
 # Build optimized release version
-WORKDIR /QC_Tools/build
+RUN rm -rf *
 RUN cmake -DCMAKE_BUILD_TYPE=Release ../
 RUN make
 # VERSION of calc_J