From f888cb7e2a7b18a02042f8643307dc8a570368cd Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 13 Aug 2015 10:27:54 +0530 Subject: [PATCH] symlink contents of `$BITNAMI_APP_DIR/webapps.defaults/` instead of copying them to `/app/` --- bitnami/tomcat/bitnami-utils-custom.sh | 5 ++++- bitnami/tomcat/entrypoint.sh | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bitnami/tomcat/bitnami-utils-custom.sh b/bitnami/tomcat/bitnami-utils-custom.sh index f1ef8aa3b9b4..9d2f60441333 100644 --- a/bitnami/tomcat/bitnami-utils-custom.sh +++ b/bitnami/tomcat/bitnami-utils-custom.sh @@ -3,5 +3,8 @@ initialize_tomcat_webapps() { echo "==> Initializing Tomcat webapps directory..." echo "" - cp -a $BITNAMI_APP_DIR/webapps.defaults/* /app/ + for f in $(ls $BITNAMI_APP_DIR/webapps.defaults/) + do + ln -sf $BITNAMI_APP_DIR/webapps.defaults/$f /app/ + done } diff --git a/bitnami/tomcat/entrypoint.sh b/bitnami/tomcat/entrypoint.sh index 3476c8cac8e1..4d62c8f3819f 100755 --- a/bitnami/tomcat/entrypoint.sh +++ b/bitnami/tomcat/entrypoint.sh @@ -28,9 +28,7 @@ chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_VOL_PREFIX/conf/ $BITN if [ "$1" = 'catalina.sh' ]; then set -- $@ $EXTRA_OPTIONS - if [ ! -d /app/manager ]; then - initialize_tomcat_webapps - fi + initialize_tomcat_webapps exec gosu $BITNAMI_APP_USER "$@" else