From 23e6aae42a077db4c54502bb0b673f377f8de6db Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:15:51 +0200 Subject: [PATCH] fix host --- Dockerfile | 4 ++-- entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1c25ea..3c29bea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,8 +54,8 @@ ENV DB_URL jdbc:postgresql://localhost:5432/oodb ENV OLAT_HOST localhost ENV EXTRA_PROPERTIES none -RUN mkdir -p /home/openolat/conf/Catalina/localhost/ -COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml +RUN mkdir -p /home/openolat/conf/Catalina/${OLAT_HOST}/ +COPY ./ROOT.xml /home/openolat/conf/Catalina/${OLAT_HOST}/ROOT.xml COPY ./olat.local.properties /home/openolat/lib/olat.local.properties diff --git a/entrypoint.sh b/entrypoint.sh index f143a2f..035c285 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,8 +3,8 @@ set -euo pipefail -sed -i -e "s#__PASSWORD__#${DB_PASSWORD}#" "/home/openolat/conf/Catalina/localhost/ROOT.xml" -sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/localhost/ROOT.xml" +sed -i -e "s#__PASSWORD__#${DB_PASSWORD}#" "/home/openolat/conf/Catalina/$OLAT_HOST/ROOT.xml" +sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/$OLAT_HOST/ROOT.xml" sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/conf/server.xml" sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/lib/olat.local.properties"