updated compose

.env

@@ -22,6 +22,10 @@ LIFERAY_DEBUG_SUSPEND=n # y or n
 
 LIFERAY_MNT_CONFIG="./liferay/config"
 LIFERAY_MNT_BUNDLE="./liferay/Portal-Bundle"
-LIFERAY_MNT_TOMCAT="./liferay/Portal-Bundle/tomcat-7.0.62"
+LIFERAY_MNT_ORIG_TOMCAT="./liferay/Portal-Bundle/tomcat-7.0.62"
+LIFERAY_MNT_TOMCAT="./liferay/tomcat/apache-tomcat-7.0.109"
 LIFERAY_MNT_WEBAPPS="./liferay/Portal-Bundle/tomcat-7.0.62/webapps"
 LIFERAY_MNT_LOGS="./logs"
+
+
+LIFERAY_OLD_TOMCAT=

compose.yml

@@ -98,7 +98,9 @@ services:
       - app-network
 
   liferay:
-    build: ./liferay
+    extends:
+      file: ./liferay/compose.yaml
+      service: liferay
     container_name: liferay
     # ports:
     #   - "${LIFERAY_PORT}:9090"  # Liferay exposed on HTTP port 80
@@ -116,8 +118,10 @@ services:
       - ${LIFERAY_MNT_CONFIG}/portal-setup-wizard.properties:${LIFERAY_PORTAL_BUNDLE_PATH}/portal-setup-wizard.properties
 
       - ${LIFERAY_MNT_WEBAPPS}:${LIFERAY_CASSANDRA_HOME}/webapps
+      - ${LIFERAY_MNT_ORIG_TOMCAT}/lib/ext:${LIFERAY_CASSANDRA_HOME}/lib/ext
+      - ${LIFERAY_MNT_ORIG_TOMCAT}/conf:${LIFERAY_CASSANDRA_HOME}/conf
+      # - ${LIFERAY_MNT_ORIG_TOMCAT}/persistence:${LIFERAY_CASSANDRA_HOME}/persistence
 
-      - ${LIFERAY_MNT_TOMCAT}:/home/life/Portal-Bundle/tomcat
       - ${LIFERAY_MNT_TOMCAT}:${LIFERAY_CASSANDRA_HOME}
       - ${LIFERAY_MNT_BUNDLE}/data:${LIFERAY_PORTAL_BUNDLE_PATH}/data
       - ${LIFERAY_MNT_BUNDLE}/gCube:${LIFERAY_PORTAL_BUNDLE_PATH}/gCube
@@ -144,7 +148,7 @@ services:
     #   timeout: 10s
     #   retries: 5
     #   start_period: 30s
-    env_file: ".env"
+    # env_file: ".env"
     depends_on:
       keycloak:
         condition: service_healthy