Commit 02230231 authored by Robert Butora's avatar Robert Butora
Browse files

docker: renames entrypoint.sh -> start-soda.sh

parent 6e6e9630

docker/Dockerfile.soda

+3 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ 


# configure at start-up



COPY entrypoint.sh.soda /root/entrypoint.sh

COPY start-soda.sh.soda /root/start-soda.sh



# modif permissions to allow run as non-root

WORKDIR ${CATALINA_HOME}
@@ -53,9 +53,6 @@ WORKDIR ${CATALINA_HOME} 
RUN chmod -R +rX .; chmod 1777 /var/log/tomcat9 /var/cache/tomcat9

WORKDIR ${CATALINA_BASE}

RUN chmod -R a+rwX conf

RUN chmod +rx /root && chmod +rx /root/entrypoint.sh

CMD ["sh", "-c", "/root/entrypoint.sh"]



#RUN pwd && chmod +x /root/entrypoint.sh

#CMD ["sh", "-c", "/root/entrypoint.sh"]

RUN chmod +rx /root && chmod +rx /root/start-soda.sh

CMD ["sh", "-c", "/root/start-soda.sh"]

docker/Dockerfile.soda.temurin-jammy

+5 −5
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ 


# configure during docker run-time



COPY entrypoint.sh.soda /root/entrypoint.sh

COPY start-soda.sh.soda /root/start-soda.sh



# modif permissions to allow run as non-root

#WORKDIR ${CATALINA_HOME} <---- these set already in orig image

#WORKDIR ${CATALINA_HOME}

#RUN chmod -R +rX .; chmod 1777 logs temp work

# below needed because TSL and ROOT-CONTEXT config

# additionally need to config TSL and ROOT-CONTEXT config

WORKDIR ${CATALINA_BASE}

RUN chmod -R a+rwX conf

RUN chmod +rx /root && chmod +rx /root/entrypoint.sh

CMD ["sh", "-c", "/root/entrypoint.sh"]

RUN chmod +rx /root && chmod +rx /root/start-soda.sh

CMD ["sh", "-c", "/root/start-soda.sh"]

docker/Dockerfile.vlkb

+3 −3
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ COPY deps/server.xml deps/server-connector.xml /etc/tomcat9/ 


# configure during docker run-time



COPY entrypoint.sh /root

COPY start-soda.sh /root



RUN echo "alias log-catalina='ls -t /var/log/tomcat9/catalina*.log | head -n 1 | xargs tail -200 '" >> /root/.bashrc$

# run



RUN pwd && chmod +x /root/entrypoint.sh

CMD ["sh", "-c", "/root/entrypoint.sh"]

RUN pwd && chmod +x /root/start-soda.sh

CMD ["sh", "-c", "/root/start-soda.sh"]

docker/entrypoint.sh.soda→docker/start-soda.sh.soda

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ case $SECURITY in 
esac



date

} 1> /tmp/entrypoint.log 2>&1

} 1> /tmp/start-soda.log 2>&1



$CATALINA_HOME/bin/catalina.sh run

docker/entrypoint.sh.vlkb→docker/start-soda.sh.vlkb

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash



set +e

LOG_FILE=/tmp/entrypoint.log

LOG_FILE=/tmp/start-soda.log



{

date