From 25e53b754e12f6d967c1f214d625e395e36957e8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 10 Nov 2018 15:37:11 +0100 Subject: [PATCH] Update to v0.33.8 & latest baseimage --- Dockerfile | 12 ++++-------- start_matrix.sh | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4dbf108..acf1f40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM cloudron/base:0.10.0 +FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617 + MAINTAINER Authors name RUN mkdir -p /app/code/nginx -RUN mkdir -p /app/data/templates WORKDIR /app/code @@ -11,7 +11,7 @@ EXPOSE 8000 # nginx RUN rm /etc/nginx/sites-enabled/* ADD nginx_matrix.conf /etc/nginx/sites-enabled/ -RUN mv /var/lib/nginx /app/data/nginx && ln -sf /app/data/nginx /var/lib/nginx +RUN rm -rf /var/lib/nginx && ln -sf /app/data/nginx /var/lib/nginx RUN rm -rf /var/log/nginx && ln -sf /run/nginx_log /var/log/nginx # TURN @@ -33,14 +33,10 @@ RUN pip install --upgrade setuptools RUN pip install psycopg2-binary py-bcrypt RUN pip install https://github.com/matrix-org/synapse/tarball/master -# Identity Server -# fix! RUN pip install https://github.com/matrix-org/sydent/tarball/master - - # copy index.html COPY index.html /app/code/nginx -RUN chown -R www-data.www-data /app/code /app/data +RUN chown -R www-data.www-data /app/code ADD start_matrix.sh /app/ diff --git a/start_matrix.sh b/start_matrix.sh index 32d0797..a58bcbb 100755 --- a/start_matrix.sh +++ b/start_matrix.sh @@ -21,7 +21,7 @@ if [[ ! -d /app/data/synapse ]]; then cp /usr/share/coturn/examples/etc/turnserver.conf /app/data/turnserver.conf # copy email templates for matrix - cp -r /app/code/synapse/res/templates /app/data/templates + cp -r /app/code/synapse/synapse/res/templates /app/data/templates # set default TURN listening port if [ -z ${TURN_TLS_PORT+x} ]; then TURN_TLS_PORT="5349"; else echo "TURN_TLS_PORT is set to '$TURN_TLS_PORT'"; fi