Merge pull request #32 from pdf2htmlEX/master

pull recent small changed from pdf2htmlEX/pdf2htmlEX

buildScripts/createAlpineTarFile

@@ -37,9 +37,11 @@ make install                                  \
   datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
   DESTDIR=../imageBuild/alpineTarDir
 
-cd ../imageBuild
+cd ../imageBuild/alpineTarDir
 
-tar czvf $ALPINE_NAME.tar.gz alpineTarDir
+tar czvf ../$ALPINE_NAME.tar.gz --owner=root --group=root *
+
+cd ..
 
 cat <<ALPINE_INSTALL > $ALPINE_NAME.install
 #!/bin/sh
@@ -71,10 +73,8 @@ apk add --no-cache \
 # Now we install the (Alpine $DIST) compiled pdf2htmlEX binaries and 
 # configuration files. 
 #
-cd /
-#
-tar xvf $ALPINE_NAME.tar.gz --strip-comonents=1
+tar xvf $ALPINE_NAME.tar.gz -C /
 
 ALPINE_INSTALL
 
-chmod a+x $ALPINE_NAME.tar.gz
+chmod a+r $ALPINE_NAME.tar.gz

buildScripts/createDockerAlpineImageFromTarFile

@@ -53,10 +53,12 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\""         >> ../../buildScripts/reSourc
 cat > Dockerfile <<DOCKERFILE_HERE_DOC
 FROM $DOCKER_FROM
 
-COPY ./$ALPINE_NAME.* /root && \
-  chmod a+x /root/$APLINE_NAME.install
+COPY ./$ALPINE_NAME.* /root/
 
-RUN /root/$ALPINE_NAME.install
+WORKDIR /root
+
+RUN chmod a+x $ALPINE_NAME.install && \
+  ./$ALPINE_NAME.install
 
 ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"]
 DOCKERFILE_HERE_DOC

buildScripts/getBuildToolsAlpine

@@ -16,6 +16,7 @@ set -ev
 sudo apk update
 sudo apk add   \
   sudo         \
+  tar          \
   wget         \
   git          \
   pkgconfig    \

pdf2htmlEX/test/runLocalBrowserTests

@@ -18,6 +18,9 @@ ps -ef | grep -v grep | grep Xvfb
 echo "-----------------------------------------------------------"
 echo ""
 
+# add an explicit delay to allow Xvfb to stablize
+sleep 2
+
 # Now we tell the test drivers about this display
 # (Note: you MUST not specify the host!)
 #
@@ -35,6 +38,9 @@ export returnCode=$?
 echo "-----------------------------------------------------------"
 echo ""
 
+# add an explicit delay to allow Xvfb to stablize
+sleep 2
+
 # Now we shutdown the virtual frame buffer
 #
 /sbin/start-stop-daemon             \

pdf2htmlEX/test/test_local_browser.py

@@ -46,4 +46,4 @@ if __name__ == '__main__':
      # turn warnings OFF to prevent 'ResourceWarning: unclosed <socket.socket'
      # see: https://stackoverflow.com/a/21500796
      #
-     unittest.main(warnings='ignore')
+     unittest.main()