From 2be983742266854df47529f40db60dc9088a8bbe Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Sat, 23 Nov 2019 10:25:09 +0000
Subject: [PATCH] continued work on image creation

---
 buildScripts/createAppImage    | 11 +++++++----
 buildScripts/createDockerImage | 13 +++++++++++++
 buildScripts/versionEnvs       |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100755 buildScripts/createDockerImage

diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage
index c59914b..a0f19c1 100755
--- a/buildScripts/createAppImage
+++ b/buildScripts/createAppImage
@@ -18,15 +18,18 @@ cd ../../imageBuild
 #
 cp /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 pdf2htmlEX.AppDir/usr/lib/
 
-wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+LINUX_DEPLOY_APP_IMAGE=linuxdeploy-$MACHINE_ARCH.AppImage
 
-chmod a+x linuxdeploy-x86_64.AppImage
+wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LINUX_DEPLOY_APP_IMAGE
 
-./linuxdeploy-x86_64.AppImage			\
+chmod a+x $LINUX_DEPLOY_APP_IMAGE
+
+./$LINUX_DEPLOY_APP_IMAGE			\
   -e pdf2htmlEX.AppDir/usr/bin/pdf2htmlEX	\
   --create-desktop-file				\
   -i ../pdf2htmlEX/logo/pdf2htmlEX.svg		\
   --appdir=pdf2htmlEX.AppDir			\
   --output appimage
 
-mv pdf2htmlEX-x86_64.AppImage pdf2htmlEX-$PDF2HTMLEX_VERSION-x86_64.AppImage
+mv pdf2htmlEX-$MACHINE_ARC.AppImage 			\
+  pdf2htmlEX-$PDF2HTMLEX_VERSION-$MACHINE_ARCH.AppImage
diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage
new file mode 100755
index 0000000..bc11110
--- /dev/null
+++ b/buildScripts/createDockerImage
@@ -0,0 +1,13 @@
+#!/bin/bash 
+
+# This bash script creates an Docker Image for pdf2htmlEX
+
+source buildScripts/versionEnvs
+
+cd imageBuild
+
+pip install git+https://github.com/larsks/dockerize
+
+dockerize		\
+  /usr/bin/pdf2htmlEX	\
+
diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs
index 30f7465..e7bf2c2 100644
--- a/buildScripts/versionEnvs
+++ b/buildScripts/versionEnvs
@@ -8,3 +8,4 @@ export POPPLER_VERSION=poppler-0.81.0
 #export FONTFORGE_VERSION=20190801
 export FONTFORGE_VERSION=20170731
 export PDF2HTMLEX_VERSION=newBuildSystem
+export MACHINE_ARCH=`uname -m`