diff --git a/Dockerfile b/Dockerfile index fb2d2f41..e4bd868c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,27 @@ # Use the base image FROM frooodle/stirling-pdf-base:beta4 +ARG VERSION_TAG + # Set Environment Variables -ENV PUID=1000 \ - PGID=1000 \ - UMASK=022 \ - DOCKER_ENABLE_SECURITY=false \ +ENV DOCKER_ENABLE_SECURITY=false \ HOME=/home/stirlingpdfuser \ VERSION_TAG=$VERSION_TAG +# PUID=1000 \ +# PGID=1000 \ +# UMASK=022 \ + # Create user and group -RUN groupadd -g $PGID stirlingpdfgroup && \ - useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \ - mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME +##RUN groupadd -g $PGID stirlingpdfgroup && \ +## useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \ +## mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME # Set up necessary directories and permissions -RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \ - chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \ - chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original +RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles +##&& \ +## chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \ +## chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original # Copy necessary files COPY ./scripts/* /scripts/ @@ -26,14 +30,16 @@ COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/ COPY build/libs/*.jar app.jar # Set font cache and permissions -RUN fc-cache -f -v && \ - chown stirlingpdfuser:stirlingpdfgroup /app.jar && \ - chmod +x /scripts/init.sh +RUN fc-cache -f -v && chmod +x /scripts/init.sh + +##&& \ +## chown stirlingpdfuser:stirlingpdfgroup /app.jar && \ +## chmod +x /scripts/init.sh # Expose necessary ports EXPOSE 8080 # Set user and run command -USER stirlingpdfuser +##USER stirlingpdfuser ENTRYPOINT ["/scripts/init.sh"] CMD ["java", "-jar", "/app.jar"]