From 4d95701ffa942be836c455d88eda87b924d0a388 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Mon, 22 Jun 2020 22:53:45 +0100 Subject: [PATCH 1/6] fixed typo in alpine docker creation as well as turn warnings back on in browser tests --- buildScripts/createDockerAlpineImageFromTarFile | 2 +- pdf2htmlEX/test/test_local_browser.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildScripts/createDockerAlpineImageFromTarFile b/buildScripts/createDockerAlpineImageFromTarFile index 5f1edf4..94e41ee 100755 --- a/buildScripts/createDockerAlpineImageFromTarFile +++ b/buildScripts/createDockerAlpineImageFromTarFile @@ -54,7 +54,7 @@ cat > Dockerfile < Date: Mon, 22 Jun 2020 23:08:56 +0100 Subject: [PATCH 2/6] add explicit delays to allow Xvfb time to stablize --- pdf2htmlEX/test/runLocalBrowserTests | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pdf2htmlEX/test/runLocalBrowserTests b/pdf2htmlEX/test/runLocalBrowserTests index f27cae2..2338c39 100755 --- a/pdf2htmlEX/test/runLocalBrowserTests +++ b/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 \ From 397b88121bf45a80a25bc1401d3609f225cbd63d Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 23 Jun 2020 05:15:28 +0100 Subject: [PATCH 3/6] corrected creation of alpine docker image --- buildScripts/createAlpineTarFile | 2 +- buildScripts/createDockerAlpineImageFromTarFile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildScripts/createAlpineTarFile b/buildScripts/createAlpineTarFile index 8022180..a33cbd3 100755 --- a/buildScripts/createAlpineTarFile +++ b/buildScripts/createAlpineTarFile @@ -77,4 +77,4 @@ tar xvf $ALPINE_NAME.tar.gz --strip-comonents=1 ALPINE_INSTALL -chmod a+x $ALPINE_NAME.tar.gz +chmod a+r $ALPINE_NAME.tar.gz diff --git a/buildScripts/createDockerAlpineImageFromTarFile b/buildScripts/createDockerAlpineImageFromTarFile index 94e41ee..ce999a1 100755 --- a/buildScripts/createDockerAlpineImageFromTarFile +++ b/buildScripts/createDockerAlpineImageFromTarFile @@ -53,10 +53,10 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> ../../buildScripts/reSourc cat > Dockerfile < Date: Tue, 23 Jun 2020 09:46:22 +0100 Subject: [PATCH 4/6] another correction to alpine docker file --- buildScripts/createDockerAlpineImageFromTarFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildScripts/createDockerAlpineImageFromTarFile b/buildScripts/createDockerAlpineImageFromTarFile index ce999a1..de13134 100755 --- a/buildScripts/createDockerAlpineImageFromTarFile +++ b/buildScripts/createDockerAlpineImageFromTarFile @@ -53,7 +53,7 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> ../../buildScripts/reSourc cat > Dockerfile < Date: Tue, 23 Jun 2020 10:52:49 +0100 Subject: [PATCH 5/6] corrected creation of alpine docker image --- buildScripts/createAlpineTarFile | 8 +++----- buildScripts/createDockerAlpineImageFromTarFile | 6 ++++-- buildScripts/getBuildToolsAlpine | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/buildScripts/createAlpineTarFile b/buildScripts/createAlpineTarFile index a33cbd3..2f9e654 100755 --- a/buildScripts/createAlpineTarFile +++ b/buildScripts/createAlpineTarFile @@ -37,9 +37,9 @@ 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 * cat < $ALPINE_NAME.install #!/bin/sh @@ -71,9 +71,7 @@ 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 diff --git a/buildScripts/createDockerAlpineImageFromTarFile b/buildScripts/createDockerAlpineImageFromTarFile index de13134..a67d63f 100755 --- a/buildScripts/createDockerAlpineImageFromTarFile +++ b/buildScripts/createDockerAlpineImageFromTarFile @@ -55,8 +55,10 @@ FROM $DOCKER_FROM COPY ./$ALPINE_NAME.* /root/ -RUN chmod a+x /root/$ALPINE_NAME.install && \ - /root/$ALPINE_NAME.install +WORKDIR /root + +RUN chmod a+x $ALPINE_NAME.install && \ + ./$ALPINE_NAME.install ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"] DOCKERFILE_HERE_DOC diff --git a/buildScripts/getBuildToolsAlpine b/buildScripts/getBuildToolsAlpine index c58deb3..750ebe6 100755 --- a/buildScripts/getBuildToolsAlpine +++ b/buildScripts/getBuildToolsAlpine @@ -16,6 +16,7 @@ set -ev sudo apk update sudo apk add \ sudo \ + tar \ wget \ git \ pkgconfig \ From 5b4dce62b9269430769d6d06aee5a35937e28923 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 23 Jun 2020 13:03:30 +0100 Subject: [PATCH 6/6] yet another correction to build of alpine docker image --- buildScripts/createAlpineTarFile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildScripts/createAlpineTarFile b/buildScripts/createAlpineTarFile index 2f9e654..da425f6 100755 --- a/buildScripts/createAlpineTarFile +++ b/buildScripts/createAlpineTarFile @@ -41,6 +41,8 @@ cd ../imageBuild/alpineTarDir tar czvf ../$ALPINE_NAME.tar.gz --owner=root --group=root * +cd .. + cat < $ALPINE_NAME.install #!/bin/sh