fixes
This commit is contained in:
parent
83627686d4
commit
d850d026ed
2 changed files with 13 additions and 16 deletions
17
Dockerfile
17
Dockerfile
|
@ -6,10 +6,6 @@ ENV VERSION_TAG=$VERSION_TAG
|
||||||
|
|
||||||
ENV ENABLE_SECURITY=false
|
ENV ENABLE_SECURITY=false
|
||||||
|
|
||||||
ARG ALPHA=false
|
|
||||||
ENV ALPHA=$ALPHA
|
|
||||||
|
|
||||||
|
|
||||||
# Create scripts folder and copy local scripts
|
# Create scripts folder and copy local scripts
|
||||||
RUN mkdir /scripts
|
RUN mkdir /scripts
|
||||||
COPY ./scripts/* /scripts/
|
COPY ./scripts/* /scripts/
|
||||||
|
@ -20,17 +16,8 @@ COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
|
||||||
COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
|
COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
|
||||||
RUN fc-cache -f -v
|
RUN fc-cache -f -v
|
||||||
|
|
||||||
# Depending on the ENABLE_SECURITY flag, download the correct JAR
|
# Always copy the JAR
|
||||||
COPY build/libs/*.jar app-temp.jar
|
COPY build/libs/*.jar app.jar
|
||||||
RUN if [ "$ALPHA" = "true" ]; then \
|
|
||||||
mv app-temp.jar app.jar; \
|
|
||||||
elif [ "$ENABLE_SECURITY" = "true" ]; then \
|
|
||||||
wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login-$VERSION_TAG.jar; \
|
|
||||||
rm -f app-temp.jar; \
|
|
||||||
else \
|
|
||||||
wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-$VERSION_TAG.jar; \
|
|
||||||
rm -f app-temp.jar; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Expose the application port
|
# Expose the application port
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
|
@ -16,6 +16,16 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check for ENABLE_SECURITY and download the appropriate JAR if required
|
||||||
|
if [ "$ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
|
||||||
|
echo "Downloading from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
|
||||||
|
curl -L -o new-app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
|
||||||
|
if [ $? -eq 0 ]; then # checks if curl was successful
|
||||||
|
rm -f app.jar
|
||||||
|
mv new-app.jar app.jar
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Run the main command
|
# Run the main command
|
||||||
exec "$@"
|
exec "$@"
|
Loading…
Reference in a new issue