From 32f37576d59a0a63f98447aeb0e79bcc5de6ea38 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Fri, 19 Jun 2020 17:20:53 +0100 Subject: [PATCH] removed old createDockerImages added explicit words SUCCESS and FAILURE in browser_tests --- buildScripts/Readme.md | 4 +- buildScripts/buildInstallLocally | 2 +- buildScripts/createDockerImageInside | 46 -------------------- buildScripts/createDockerImageOutside | 62 --------------------------- buildScripts/createImages | 4 +- buildScripts/travisLinuxDoItAll | 6 +-- pdf2htmlEX/test/browser_tests.py | 4 +- 7 files changed, 8 insertions(+), 120 deletions(-) delete mode 100755 buildScripts/createDockerImageInside delete mode 100755 buildScripts/createDockerImageOutside diff --git a/buildScripts/Readme.md b/buildScripts/Readme.md index 082cfd8..ba3f775 100644 --- a/buildScripts/Readme.md +++ b/buildScripts/Readme.md @@ -199,8 +199,8 @@ Typically, most users, will run one of the following "top-level" scripts: `pdf2htmlEX`, installs it and `poppler-data` into a Debian archive (`*.deb`). -- **`createDockerImage`**: Using an already compile version of - `pdf2htmlEX`, installs it and `poppler-data` into a Docker image. +- **`createDockerUbuntuImageFromDeb`**: Installs the Debian archive of + `pdf2htmlEX` created by `createDebianPackage` into a Docker image. - **`getBuildTools`**: Locally `apt` installs all development *tools* required to build `pdf2htmlEX`. diff --git a/buildScripts/buildInstallLocally b/buildScripts/buildInstallLocally index 11c0d69..bd7a49c 100755 --- a/buildScripts/buildInstallLocally +++ b/buildScripts/buildInstallLocally @@ -50,7 +50,7 @@ set -ev #./buildScripts/createAppImage -#./buildScripts/createDockerImage +#./buildScripts/createDockerUbuntuImageFromDeb #./buildScripts/uploadGitHubRelease diff --git a/buildScripts/createDockerImageInside b/buildScripts/createDockerImageInside deleted file mode 100755 index dcd602e..0000000 --- a/buildScripts/createDockerImageInside +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# This bash script creates a docker image from an existing pdf2htmlEX -# -# This is the part which can run *inside* a docker container. - -echo "" -echo "-------------------------------------------------------------------" -echo "CREATING pdf2htmlEX Docker Image (run inside a docker container)" -echo "-------------------------------------------------------------------" -echo "" - -# Collect everything that will be needed... - -source buildScripts/reSourceVersionEnvs - -source buildScripts/dockerFunctions - -set -ev - -mkdir -p imageBuild/dockerDir - -cd pdf2htmlEX/build - -sudo rm -rf install_manifest.txt - -make install DESTDIR=../../imageBuild/dockerDir - -cd ../../poppler-data - -make install \ - prefix=$PDF2HTMLEX_PREFIX \ - datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \ - DESTDIR=../imageBuild/dockerDir - -cd ../imageBuild/dockerDir - -copy_deps - -# Make sure directories can be traversed by nobody -# -#find . -type d -exec chmod 755 {} \; -# -# Make sure files can be read by nobody -# -#find . -type f -exec chmod 644 {} \; diff --git a/buildScripts/createDockerImageOutside b/buildScripts/createDockerImageOutside deleted file mode 100755 index 390062c..0000000 --- a/buildScripts/createDockerImageOutside +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# This bash script creates a docker image from an existing pdf2htmlEX -# -# This is the part which must be run *outside* of any docker container. - -echo "" -echo "-------------------------------------------------------------------" -echo "CREATING pdf2htmlEX Docker Image (run outside any docker container)" -echo "-------------------------------------------------------------------" -echo "" - -# Collect everything that will be needed... - -source buildScripts/reSourceVersionEnvs - -source buildScripts/dockerFunctions - -set -ev - -mkdir -p imageBuild/dockerDir - -cd imageBuild/dockerDir - -if [ -z "$DOCKER_FROM" ]; then - echo "" - read -p "Enter the docker image for the 'from' base: " DOCKER_FROM - echo "" - if [ -z "$DOCKER_FROM" ]; then - echo "DOCKER_FROM not set... so we can not build the docker image" - exit 1 - fi -fi - -if [ -z "$DOCKER_USERNAME" ]; then - echo "" - read -p "Enter a docker username: " DOCKER_USERNAME - echo "" - if [ -z "$DOCKER_USERNAME" ]; then - echo "DOCKER_USERNAME not set... so we can not build the docker image" - exit 1 - fi -fi - -export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_BRANCH-$BUILD_TIME" - -echo "export DOCKER_FROM=\"$DOCKER_FROM\"" >> ../../buildScripts/reSourceVersionEnvs -echo "export DOCKER_USERNAME=\"$DOCKER_USERNAME\"" >> ../../buildScripts/reSourceVersionEnvs -echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> ../../buildScripts/reSourceVersionEnvs - -delete_blacklisted - -cat > Dockerfile <