andreas/synapse-app-mas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to v0.33.8 & latest baseimage

Browse Source
This commit is contained in:
Matthias
2018-11-10 15:37:11 +01:00
parent 351de25f3e
commit 25e53b754e
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@@ -1,8 +1,8 @@
FROM cloudron/base:0.10.0 FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
MAINTAINER Authors name <support@cloudron.io> MAINTAINER Authors name <support@cloudron.io>
RUN mkdir -p /app/code/nginx RUN mkdir -p /app/code/nginx
RUN mkdir -p /app/data/templates
WORKDIR /app/code WORKDIR /app/code
@@ -11,7 +11,7 @@ EXPOSE 8000
# nginx # nginx
RUN rm /etc/nginx/sites-enabled/* RUN rm /etc/nginx/sites-enabled/*
ADD nginx_matrix.conf /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 RUN rm -rf /var/log/nginx && ln -sf /run/nginx_log /var/log/nginx
# TURN # TURN
@@ -33,14 +33,10 @@ RUN pip install --upgrade setuptools
RUN pip install psycopg2-binary py-bcrypt RUN pip install psycopg2-binary py-bcrypt
RUN pip install https://github.com/matrix-org/synapse/tarball/master 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
COPY index.html /app/code/nginx 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/ ADD start_matrix.sh /app/

2
start_matrix.sh
View File

@@ -21,7 +21,7 @@ if [[ ! -d /app/data/synapse ]]; then
cp /usr/share/coturn/examples/etc/turnserver.conf /app/data/turnserver.conf cp /usr/share/coturn/examples/etc/turnserver.conf /app/data/turnserver.conf
# copy email templates for matrix # 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 # 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 if [ -z ${TURN_TLS_PORT+x} ]; then TURN_TLS_PORT="5349"; else echo "TURN_TLS_PORT is set to '$TURN_TLS_PORT'"; fi