From 50feab31a010aa4243d73002bd5c6f0a5f53f8bf Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:21:55 +0200 Subject: [PATCH] fix host --- Dockerfile | 3 +-- entrypoint.sh | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c29bea..09bfbf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,8 +54,7 @@ ENV DB_URL jdbc:postgresql://localhost:5432/oodb ENV OLAT_HOST localhost ENV EXTRA_PROPERTIES none -RUN mkdir -p /home/openolat/conf/Catalina/${OLAT_HOST}/ -COPY ./ROOT.xml /home/openolat/conf/Catalina/${OLAT_HOST}/ROOT.xml +COPY ./ROOT.xml /home/openolat/tmp-ROOT.xml COPY ./olat.local.properties /home/openolat/lib/olat.local.properties diff --git a/entrypoint.sh b/entrypoint.sh index 035c285..d909b8d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,9 +2,11 @@ set -euo pipefail +mkdir -p "/home/openolat/conf/Catalina/${OLAT_HOST}/" +cp "/home/openolat/tmp-ROOT.xml" "/home/openolat/conf/Catalina/${OLAT_HOST}/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#__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"