From ca690632e9273421f03f77ed9d31fe3ada6408b8 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 26 Nov 2019 07:52:30 +0000 Subject: [PATCH] check for existing docker commands before trying to create docker --- buildScripts/createDockerImage | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage index f9f2cda..226aa08 100755 --- a/buildScripts/createDockerImage +++ b/buildScripts/createDockerImage @@ -2,33 +2,38 @@ # This bash script creates a docker image from an existing pdf2htmlEX -source buildScripts/versionEnvs +if [ -x "$(which docker)" ]; then -source buildScripts/dockerFunctions + source buildScripts/versionEnvs -mkdir -p imageBuild/dockerDir + source buildScripts/dockerFunctions -cd pdf2htmlEX/build + mkdir -p imageBuild/dockerDir -sudo rm -rf install_manifest.txt + cd pdf2htmlEX/build -make install DESTDIR=../../imageBuild/dockerDir + sudo rm -rf install_manifest.txt -cd ../../imageBuild/dockerDir + make install DESTDIR=../../imageBuild/dockerDir -copy_deps + cd ../../imageBuild/dockerDir -delete_blacklisted + copy_deps -cat >> Dockerfile <> Dockerfile <