From 2a273d5b255269f54d2a1723a05f194ca2ee8551 Mon Sep 17 00:00:00 2001
From: nils <48135649+Nilstrieb@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:48:49 +0200
Subject: [PATCH] add properties

---
 Dockerfile            | 16 ++++++++++++----
 olat.local.properties | 12 ++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 olat.local.properties

diff --git a/Dockerfile b/Dockerfile
index 5cfac89..42fc36f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,13 @@
 FROM ubuntu:22.04
 
 RUN apt-get update
-RUN apt-get install -y curl unzip
+RUN apt-get install -y curl unzip locales
+
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8
 
 RUN useradd -m -s /bin/bash openolat
 
@@ -19,9 +25,9 @@ RUN curl -OL https://github.com/adoptium/temurin17-binaries/releases/download/jd
     && ln -s jdk-17.0.8.1+1-jre jre \
     && rm -r ./downloads
 
-RUN curl -O https://www.openolat.com/releases/openolat_17214.war --output-dir ./downloads --create-dirs \
-    && unzip -d openolat-17.2.14 ./downloads/openolat_17214.war \
-    && ln -s openolat-17.2.14 webapp \
+RUN curl -O https://www.openolat.com/releases/openolat_1804.war --output-dir ./downloads --create-dirs \
+    && unzip -d openolat-18.0.4 ./downloads/openolat_1804.war \
+    && ln -s openolat-18.0.4 webapp \
     && rm -r ./downloads
 
 RUN mkdir bin conf lib run logs
@@ -49,6 +55,8 @@ ENV DB_URL jdbc:postgresql://localhost:5432/oodb
 RUN mkdir -p /home/openolat/conf/Catalina/localhost/
 COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml
 
+COPY ./olat.local.properties /home/openolat/lib/olat.local.properties
+
 COPY ./entrypoint.sh /home/openolat/entrypoint.sh
 
 EXPOSE 8088
diff --git a/olat.local.properties b/olat.local.properties
new file mode 100644
index 0000000..b791f85
--- /dev/null
+++ b/olat.local.properties
@@ -0,0 +1,12 @@
+db.source=jndi
+db.jndi=java:comp/env/jdbc/openolatDS
+db.vendor=postgresql
+installation.dir=/home/openolat
+log.dir=/home/openolat/logs
+server.contextpath=/openolat
+server.domainname=localhost
+server.port=8088
+server.port.ssl=0
+smtp.host=disabled
+tomcat.id=1
+userdata.dir=/home/openolat/olatdata