diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile index ae576b2..1cf4373 100644 --- a/tomcat/Dockerfile +++ b/tomcat/Dockerfile @@ -35,12 +35,6 @@ RUN chown -R ${USERNAME}:${GROUPNAME} /usr/local/tomcat RUN mkdir -p /home/${USERNAME}/.cache/dconf && \ chown -R ${USERNAME}:${GROUPNAME} /home/${USERNAME}/.cache/dconf -# Copy entrypoint script and make it executable -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] - USER ${USERNAME} CMD ["catalina.sh", "run"] \ No newline at end of file diff --git a/tomcat/Dockerfile_infinity24 b/tomcat/Dockerfile_infinity24 index f3777c8..5d28698 100644 --- a/tomcat/Dockerfile_infinity24 +++ b/tomcat/Dockerfile_infinity24 @@ -19,14 +19,8 @@ COPY ./conf/server.xml /usr/local/tomcat/conf/server.xml COPY ./libs/ /usr/local/tomcat/lib/ # Set permissions on Tomcat directories -RUN chown -R ${USERNAME}:${GROUPNAME} /usr/local/tomcat +RUN chown -R ${USER_ID}:${GROUP_ID} /usr/local/tomcat -# Copy entrypoint script and make it executable -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] - -USER ${USERNAME} +USER ${USER_ID} CMD ["catalina.sh", "run"] diff --git a/tomcat/entrypoint.sh b/tomcat/entrypoint.sh deleted file mode 100644 index 17fff87..0000000 --- a/tomcat/entrypoint.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -umask 002 - -#cartelle docfinance -mkdir -p /usr/local/tomcat/docfinance_in -mkdir -p /usr/local/tomcat/docfinance_out -chmod -R 775 /usr/local/tomcat/docfinance_in -chmod -R 775 /usr/local/tomcat/docfinance_out - -# Run the main Tomcat process -exec "$@" \ No newline at end of file