Compare commits

...

9 Commits

Author SHA1 Message Date
Anthony Stirling
a03470d2de Update Dockerfile 2023-12-11 10:09:28 +00:00
Anthony Stirling
ef7c98e5cb Merge pull request #514 from Frooodle/securityStuff
Security stuff
2023-12-11 10:00:57 +00:00
Anthony Stirling
c9cd1331d2 Merge branch 'main' into securityStuff 2023-12-11 09:58:09 +00:00
Anthony Stirling
ddc14517b8 Merge branch 'securityStuff' of git@github.com:Frooodle/Stirling-PDF.git into securityStuff 2023-12-11 09:57:37 +00:00
Anthony Stirling
578aecf977 WeasyPrint 2023-12-11 09:57:28 +00:00
Anthony Stirling
b1ca938053 Merge pull request #513 from Frooodle/securityStuff
fix
2023-12-11 09:35:23 +00:00
Anthony Stirling
298fe349c1 Merge branch 'main' into securityStuff 2023-12-11 09:33:20 +00:00
Anthony Stirling
f4364a3f33 bump 2023-12-11 09:33:05 +00:00
Anthony Stirling
e0f068bc9d test 2023-12-11 09:32:36 +00:00
4 changed files with 6 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
# Use the base image
FROM frooodle/stirling-pdf-base:version6
FROM frooodle/stirling-pdf-base:version7
ARG VERSION_TAG

View File

@@ -8,7 +8,6 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
openjdk-17-jre
# Doc conversion
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -18,6 +17,7 @@ RUN apt-get update && \
libreoffice-calc-nogui \
libreoffice-impress-nogui \
python3-uno \
curl \
unoconv
@@ -35,8 +35,8 @@ apt-get update && \
pip install --no-cache-dir --upgrade pillow==10.0.1 reportlab==3.6.13 wheel==0.38.1 setuptools==65.5.1 pyjwt==2.4.0 cryptography==39.0.1
#CV
RUN pip install --no-cache-dir opencv-python-headless
#CV and HTML
RUN pip install --no-cache-dir opencv-python-headless WeasyPrint
# cleanup and etc

View File

@@ -8,7 +8,7 @@ plugins {
}
group = 'stirling.software'
version = '0.16.0'
version = '0.16.1'
sourceCompatibility = '17'
repositories {

View File

@@ -20,6 +20,7 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
done
fi
echo "Running Stirling PDF with DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY} and VERSION_TAG=${VERSION_TAG}"
# Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
if [ ! -f app-security.jar ]; then