1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00

penultimage build tools

This commit is contained in:
Stephen Gaito 2019-11-28 13:04:03 +00:00
parent 99ff9da2d9
commit 8fe76e3086
5 changed files with 45 additions and 18 deletions

View File

@ -31,7 +31,7 @@ DOCKERFILE_HERE_DOC
cd .. cd ..
docker build -t $DOCKER_USERNAME/pdf2htmlex:-`date +%Y_%m_%d-%H_%M_%S` dockerDir docker build -t $DOCKER_USERNAME/pdf2htmlex:$PDF2THMLEX_BRANCH-$BUILD_TIME dockerDir
else else
echo "Docker is not installed... skipping creation of a docker image." echo "Docker is not installed... skipping creation of a docker image."

View File

@ -8,7 +8,6 @@
# #
# You can OPTIONALLY set the following environment variables: # You can OPTIONALLY set the following environment variables:
# DOCKER_PASSWORD (if not set you will be asked for your password) # DOCKER_PASSWORD (if not set you will be asked for your password)
# UPLOADTOOL_BODY (the text of the github release message)
# #
source ./buildScripts/reSourceVersionEnvs source ./buildScripts/reSourceVersionEnvs
@ -28,7 +27,6 @@ if [ -n "$GITHUB_TOKEN" ]; then
echo $DOCKER_NAME > dockerImageName echo $DOCKER_NAME > dockerImageName
if [ -z "$UPLOADTOOL_BODY" ]; then
export UPLOADTOOL_BODY=<<RELEASE_MESSAGE export UPLOADTOOL_BODY=<<RELEASE_MESSAGE
This is the development/testing release of the pdf2htmlEX AppImage. This is the development/testing release of the pdf2htmlEX AppImage.
@ -36,13 +34,8 @@ You can download the AppImage and 'just run it'.
See: https://appimage.org/ for details See: https://appimage.org/ for details
RELEASE_MESSAGE RELEASE_MESSAGE
fi
bash upload.sh \ bash upload.sh $APPIMAGE_NAME appImageName dockerImageName buildTime
$($APPIMAGE_NAME) \
../appImageName \
../dockerImageName \
../buildTime
else else
echo "GITHUB_TOKEN not set... so we can not upload release artefacts." echo "GITHUB_TOKEN not set... so we can not upload release artefacts."
@ -56,6 +49,8 @@ if [ -x "$(which docker)" ]; then
if [ -n "$DOCKER_USERNAME" ]; then if [ -n "$DOCKER_USERNAME" ]; then
if [ -z "$DOCKER_PASSWORD" ]; then if [ -z "$DOCKER_PASSWORD" ]; then
echo ""
echo "Please type your the Docker hub password"
docker login -u "$DOCKER_USERNAME" docker login -u "$DOCKER_USERNAME"
else else
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

View File

@ -31,4 +31,5 @@ echo "export BUILD_TIME=\"$BUILD_TIME\"" >> buildScripts/reSourceV
echo "export DOCKER_FROM=\"$DOCKER_FROM\"" >> buildScripts/reSourceVersionEnvs echo "export DOCKER_FROM=\"$DOCKER_FROM\"" >> buildScripts/reSourceVersionEnvs
echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> buildScripts/reSourceVersionEnvs echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> buildScripts/reSourceVersionEnvs
echo "export APPIMAGE_NAME=\"$APPIMAGE_NAME\"" >> buildScripts/reSourceVersionEnvs echo "export APPIMAGE_NAME=\"$APPIMAGE_NAME\"" >> buildScripts/reSourceVersionEnvs
echo "export TRAVIS_REPO_SLUG=\"$TRAVIS_REPO_SLUG\"" >> buildScripts/reSourceVersionEnvs

View File

@ -2,17 +2,21 @@
# This bash script automates the tests # This bash script automates the tests
mkdir -p testDir
cd testDir
wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/appImageName wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/appImageName
export APP_IMAGE_NAME=$(cat appImageName) export APPIMAGE_NAME=$(cat appImageName)
wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/$APP_IMAGE_NAME wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/$APPIMAGE_NAME
chmod a+x $APP_IMAGE_NAME chmod a+x $APPIMAGE_NAME
if ! ./$APP_IMAGE_NAME --version ; then if ! ./$APPIMAGE_NAME --version ; then
echo "COULD NOT run the AppImage" echo "COULD NOT run the AppImage"
exit(-1) exit 1
fi fi
if [ -x "$(which docker)" ]; then if [ -x "$(which docker)" ]; then
@ -22,8 +26,8 @@ if [ -x "$(which docker)" ]; then
export DOCKER_IMAGE_NAME=$(cat dockerImageName) export DOCKER_IMAGE_NAME=$(cat dockerImageName)
if ! docker run $DOCKER_IMAGE_NAME --version ; then if ! docker run $DOCKER_IMAGE_NAME --version ; then
echo "COULD NOT run the AppImage" echo "COULD NOT run the Docker Image"
exit(-1) exit 1
fi fi
fi fi

View File

@ -1,5 +1,32 @@
#!/bin/bash #!/bin/bash
# This bash script automates the tests on a TravisCI worker # This bash script automates the tests
wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/appImageName
export APPIMAGE_NAME=$(cat appImageName)
wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/$APPIMAGE_NAME
chmod a+x $APPIMAGE_NAME
if ! ./$APPIMAGE_NAME --version ; then
echo "COULD NOT run the AppImage"
exit 1
fi
if [ -x "$(which docker)" ]; then
wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/dockerImageName
export DOCKER_IMAGE_NAME=$(cat dockerImageName)
if ! docker run $DOCKER_IMAGE_NAME --version ; then
echo "COULD NOT run the Docker Image"
exit 1
fi
fi