diff --git a/.travis.yml b/.travis.yml index ef82ba6..5310be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,6 +89,7 @@ matrix: script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - ./buildScripts/reportEnvs || travis_terminate 1; - ./buildScripts/getBuildTools || travis_terminate 1; - ./buildScripts/getDevLibraries || travis_terminate 1; - ./buildScripts/getPoppler || travis_terminate 1; diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage index 226aa08..d2247f6 100755 --- a/buildScripts/createDockerImage +++ b/buildScripts/createDockerImage @@ -26,12 +26,12 @@ if [ -x "$(which docker)" ]; then FROM $DOCKER_FROM COPY ./ / RUN ldconfig -ENTRYPOINT ["/usr/bin/pdf2htmlEX"] +ENTRYPOINT ["/usr/local/bin/pdf2htmlEX"] DOCKERFILE_HERE_DOC cd .. - docker build -t stephengaito/pdf2htmlex:test-`date +%Y%m%d-%H.%M.%S` dockerDir + docker build -t stephengaito/pdf2htmlex:test-`date +%Y_%m_%d-%H_%M_%S` dockerDir else echo "Docker is not installed... skipping creation of a docker image." diff --git a/buildScripts/reportEnvs b/buildScripts/reportEnvs new file mode 100755 index 0000000..bac508a --- /dev/null +++ b/buildScripts/reportEnvs @@ -0,0 +1,22 @@ +#!/bin/bash + +# This bash script reports the more important TRAVIS environment variables + +echo "TravisCI env:" +echo " tag: [$TARVIS_TAG]" +echo " branch: [$TARVIS_BRANCH]" +echo " commit: [$TARVIS_COMMIT]" +echo " build dir: [$TRAVIS_BUILD_DIR]" +echo " repo slug: [$TRAVIS_REPO_SLUG]" + +echo "UploadTool env:" +echo " suffix: [$UPLOADTOOL_SUFFIX]" + +source ./buildScripts/versionEnvs + +echo "pdf2htmlEX env:" +echo " poppler: [$POPPLER_VERSION]" +echo " fontforge: [$FONTFORGE_VERSION]" +echo " pdf2htmlEX: [$PDF2HTMLEX_VERSION]" +echo " docker from: [$DOCKER_FROM]" +echo "machine arch: [$MACHINE_ARCH]"