From 523b98f8a36d02b0b184ab82dd46b42c6fbba56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20BENO=C3=8ET?= <tseeker@nocternity.net>
Date: Fri, 3 Jan 2025 16:14:25 +0100
Subject: [PATCH] chore: integrate both web frontends to the Docker stuff

---
 docker/Dockerfile.application                 | 22 +++++++++++++++++++
 docker/compose.yml                            | 18 +++++++++++++++
 .../WebContent/WEB-INF/admin-servlet.xml      |  3 ++-
 .../WebContent/WEB-INF/main-servlet.xml       |  3 ++-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile.application b/docker/Dockerfile.application
index d11a4bb..712f257 100644
--- a/docker/Dockerfile.application
+++ b/docker/Dockerfile.application
@@ -20,3 +20,25 @@ COPY --from=build /src/legacyworlds-server/legacyworlds-server-main/target/lib /
 ADD docker/backend-entrypoint.sh /app/entrypoint.sh
 ENTRYPOINT ["/app/entrypoint.sh"]
 CMD ["server"]
+
+FROM tomcat:6.0-jre7 AS tomcat-base
+RUN <<EOF
+	rm -rf /usr/local/tomcat/webapps/*
+	adduser --system --no-create-home \
+		--ingroup www-data \
+		--shell /bin/false \
+		--home $CATALINA_HOME \
+		tomcat
+	chown -R tomcat: /usr/local/tomcat
+EOF
+USER tomcat
+
+FROM tomcat-base AS lwmain
+COPY --from=build \
+	/src/legacyworlds-web/legacyworlds-web-main/target/*.war \
+	$CATALINA_HOME/webapps/ROOT.war
+
+FROM tomcat-base AS lwadmin
+COPY --from=build \
+	/src/legacyworlds-web/legacyworlds-web-main/target/*.war \
+	$CATALINA_HOME/webapps/ROOT.war
diff --git a/docker/compose.yml b/docker/compose.yml
index 03af436..ef2df14 100644
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -17,6 +17,24 @@ services:
     secrets:
       - lw_db_password
 
+  web-main:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile.application
+      target: lwmain
+    restart: always
+    environment:
+      LW_BACKEND_HOST: backend
+
+  web-admin:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile.application
+      target: lwadmin
+    restart: always
+    environment:
+      LW_BACKEND_HOST: backend
+
 secrets:
   lw_db_password:
     environment: LW_DB_PASSWORD
diff --git a/legacyworlds-web/legacyworlds-web-admin/WebContent/WEB-INF/admin-servlet.xml b/legacyworlds-web/legacyworlds-web-admin/WebContent/WEB-INF/admin-servlet.xml
index 0391a5a..3ba4c28 100644
--- a/legacyworlds-web/legacyworlds-web-admin/WebContent/WEB-INF/admin-servlet.xml
+++ b/legacyworlds-web/legacyworlds-web-admin/WebContent/WEB-INF/admin-servlet.xml
@@ -7,6 +7,7 @@
 
 	<context:annotation-config />
 	<context:component-scan base-package="com.deepclone.lw.web.admin" />
+	<context:property-placeholder />
 
 	<!-- FreeMarker templating library -->
 	<bean id="freemarkerConfig"
@@ -29,7 +30,7 @@
 	<bean id="sessionSrv" class="org.springframework.remoting.rmi.RmiProxyFactoryBean"
 		scope="prototype">
 		<property name="serviceInterface" value="com.deepclone.lw.session.SessionAccessor" />
-		<property name="serviceUrl" value="rmi://localhost:9137/sessionSrv" />
+		<property name="serviceUrl" value="rmi://${LW_BACKEND_HOST}:9137/sessionSrv" />
 	</bean>
 
 	<!-- General web beans -->
diff --git a/legacyworlds-web/legacyworlds-web-main/WebContent/WEB-INF/main-servlet.xml b/legacyworlds-web/legacyworlds-web-main/WebContent/WEB-INF/main-servlet.xml
index 25ea52b..01df89b 100644
--- a/legacyworlds-web/legacyworlds-web-main/WebContent/WEB-INF/main-servlet.xml
+++ b/legacyworlds-web/legacyworlds-web-main/WebContent/WEB-INF/main-servlet.xml
@@ -7,6 +7,7 @@
 
 	<context:annotation-config />
 	<context:component-scan base-package="com.deepclone.lw.web.main" />
+	<context:property-placeholder />
 
 	<!-- FreeMarker templating library -->
 	<bean id="freemarkerConfig"
@@ -29,7 +30,7 @@
 	<bean id="sessionSrv" class="org.springframework.remoting.rmi.RmiProxyFactoryBean"
 		scope="prototype">
 		<property name="serviceInterface" value="com.deepclone.lw.session.SessionAccessor" />
-		<property name="serviceUrl" value="rmi://localhost:9137/sessionSrv" />
+		<property name="serviceUrl" value="rmi://${LW_BACKEND_HOST}:9137/sessionSrv" />
 	</bean>
 
 	<!-- General web beans -->