mirror of
https://github.com/pdf2htmlEX/pdf2htmlEX.git
synced 2024-12-21 20:50:07 +00:00
Merge pull request #32 from pdf2htmlEX/master
pull recent small changed from pdf2htmlEX/pdf2htmlEX
This commit is contained in:
commit
a865e23b4a
@ -37,9 +37,11 @@ make install \
|
|||||||
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
|
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
|
||||||
DESTDIR=../imageBuild/alpineTarDir
|
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
|
cat <<ALPINE_INSTALL > $ALPINE_NAME.install
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
@ -71,10 +73,8 @@ apk add --no-cache \
|
|||||||
# Now we install the (Alpine $DIST) compiled pdf2htmlEX binaries and
|
# Now we install the (Alpine $DIST) compiled pdf2htmlEX binaries and
|
||||||
# configuration files.
|
# configuration files.
|
||||||
#
|
#
|
||||||
cd /
|
tar xvf $ALPINE_NAME.tar.gz -C /
|
||||||
#
|
|
||||||
tar xvf $ALPINE_NAME.tar.gz --strip-comonents=1
|
|
||||||
|
|
||||||
ALPINE_INSTALL
|
ALPINE_INSTALL
|
||||||
|
|
||||||
chmod a+x $ALPINE_NAME.tar.gz
|
chmod a+r $ALPINE_NAME.tar.gz
|
||||||
|
@ -53,10 +53,12 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> ../../buildScripts/reSourc
|
|||||||
cat > Dockerfile <<DOCKERFILE_HERE_DOC
|
cat > Dockerfile <<DOCKERFILE_HERE_DOC
|
||||||
FROM $DOCKER_FROM
|
FROM $DOCKER_FROM
|
||||||
|
|
||||||
COPY ./$ALPINE_NAME.* /root && \
|
COPY ./$ALPINE_NAME.* /root/
|
||||||
chmod a+x /root/$APLINE_NAME.install
|
|
||||||
|
|
||||||
RUN /root/$ALPINE_NAME.install
|
WORKDIR /root
|
||||||
|
|
||||||
|
RUN chmod a+x $ALPINE_NAME.install && \
|
||||||
|
./$ALPINE_NAME.install
|
||||||
|
|
||||||
ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"]
|
ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"]
|
||||||
DOCKERFILE_HERE_DOC
|
DOCKERFILE_HERE_DOC
|
||||||
|
@ -16,6 +16,7 @@ set -ev
|
|||||||
sudo apk update
|
sudo apk update
|
||||||
sudo apk add \
|
sudo apk add \
|
||||||
sudo \
|
sudo \
|
||||||
|
tar \
|
||||||
wget \
|
wget \
|
||||||
git \
|
git \
|
||||||
pkgconfig \
|
pkgconfig \
|
||||||
|
@ -18,6 +18,9 @@ ps -ef | grep -v grep | grep Xvfb
|
|||||||
echo "-----------------------------------------------------------"
|
echo "-----------------------------------------------------------"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
# add an explicit delay to allow Xvfb to stablize
|
||||||
|
sleep 2
|
||||||
|
|
||||||
# Now we tell the test drivers about this display
|
# Now we tell the test drivers about this display
|
||||||
# (Note: you MUST not specify the host!)
|
# (Note: you MUST not specify the host!)
|
||||||
#
|
#
|
||||||
@ -35,6 +38,9 @@ export returnCode=$?
|
|||||||
echo "-----------------------------------------------------------"
|
echo "-----------------------------------------------------------"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
# add an explicit delay to allow Xvfb to stablize
|
||||||
|
sleep 2
|
||||||
|
|
||||||
# Now we shutdown the virtual frame buffer
|
# Now we shutdown the virtual frame buffer
|
||||||
#
|
#
|
||||||
/sbin/start-stop-daemon \
|
/sbin/start-stop-daemon \
|
||||||
|
@ -46,4 +46,4 @@ if __name__ == '__main__':
|
|||||||
# turn warnings OFF to prevent 'ResourceWarning: unclosed <socket.socket'
|
# turn warnings OFF to prevent 'ResourceWarning: unclosed <socket.socket'
|
||||||
# see: https://stackoverflow.com/a/21500796
|
# see: https://stackoverflow.com/a/21500796
|
||||||
#
|
#
|
||||||
unittest.main(warnings='ignore')
|
unittest.main()
|
||||||
|
Loading…
Reference in New Issue
Block a user