Merge pull request #513 from Frooodle/securityStuff

fix
This commit is contained in:
Anthony Stirling 2023-12-11 09:35:23 +00:00 committed by GitHub
commit b1ca938053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -8,7 +8,6 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
openjdk-17-jre openjdk-17-jre
# Doc conversion # Doc conversion
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -18,6 +17,7 @@ RUN apt-get update && \
libreoffice-calc-nogui \ libreoffice-calc-nogui \
libreoffice-impress-nogui \ libreoffice-impress-nogui \
python3-uno \ python3-uno \
curl \
unoconv unoconv

View File

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

View File

@ -20,6 +20,7 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
done done
fi 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 # Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
if [ ! -f app-security.jar ]; then if [ ! -f app-security.jar ]; then