Noratrieb/dockerolat
1
0
Fork 0
mirror of https://github.com/Noratrieb/dockerolat.git synced 2026-01-14 18:05:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow setting extra properties

Browse source
This commit is contained in:
nora 2023-09-05 18:57:15 +02:00
parent 95556e7984
commit d8b5cd9083
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -5,8 +5,8 @@ RUN apt-get install -y curl unzip locales
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \ RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen locale-gen
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
RUN useradd -m -s /bin/bash openolat RUN useradd -m -s /bin/bash openolat
@ -52,6 +52,7 @@ ENV JRE_HOME /home/openolat/jre
ENV DB_PASSWORD default ENV DB_PASSWORD default
ENV DB_URL jdbc:postgresql://localhost:5432/oodb ENV DB_URL jdbc:postgresql://localhost:5432/oodb
ENV OLAT_HOST localhost ENV OLAT_HOST localhost
ENV EXTRA_PROPERTIES none
RUN mkdir -p /home/openolat/conf/Catalina/localhost/ RUN mkdir -p /home/openolat/conf/Catalina/localhost/
COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml

1
README.md
View file

@ -7,3 +7,4 @@ https://docs.openolat.org/manual_admin/installation/installGuide/
- `DB_PASSWORD`, default `default` - `DB_PASSWORD`, default `default`
- `DB_URL`, default `jdbc:postgresql://localhost:5432/oodb` - `DB_URL`, default `jdbc:postgresql://localhost:5432/oodb`
- `OLAT_HOST`, default `localhost` - `OLAT_HOST`, default `localhost`
- `EXTRA_PROPERTIES`, default `none`

4
entrypoint.sh
View file

@ -9,4 +9,8 @@ sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/localhost/ROOT
sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/conf/server.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" sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/lib/olat.local.properties"
if [ "$EXTRA_PROPERTIES" != "none" ]; then
cat "$EXTRA_PROPERTIES" >> "/home/openolat/lib/olat.local.properties"
fi
exec /home/openolat/tomcat/bin/catalina.sh run exec /home/openolat/tomcat/bin/catalina.sh run