Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
net-tools \
telnetd \
procps \
logrotate \
&& rm -rf /var/lib/apt/lists/* \
&& cp /tmp/metacat.war /tmp/metacat-index.war /usr/local/tomcat/webapps \
&& cat /tmp/catalina.properties >> /usr/local/tomcat/conf/catalina.properties

ADD metacat.conf /etc/logrotate.d/

COPY apply_config.py /usr/local/bin/
RUN ln -s usr/local/bin/apply_config.py / # backwards compat

Expand Down
7 changes: 6 additions & 1 deletion docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ if [ "$1" = 'bin/catalina.sh' ]; then
sleep 0.1
done

echo
echo '**************************************'
echo "Logrotating catalina.out"
echo '**************************************'
echo
/usr/sbin/logrotate -s /usr/local/tomcat/logs/logrotate-status.log /etc/logrotate.d/metacat.conf

METACAT_DEFAULT_WAR=/usr/local/tomcat/webapps/metacat.war
METACAT_DIR=/usr/local/tomcat/webapps/${METACAT_APP_CONTEXT}
Expand Down Expand Up @@ -112,7 +118,6 @@ if [ "$1" = 'bin/catalina.sh' ]; then
ADMINPASS=`cat $ADMINPASS_FILE`
fi


# Look for the properties file
if [ -s $APP_PROPERTIES_FILE ];
then
Expand Down
8 changes: 8 additions & 0 deletions metacat.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/usr/local/tomcat/logs/catalina.out {
copytruncate
rotate 12
compress
missingok
size 100M
dateext
}