Update to 1.0.0

This commit is contained in:
Matthias
2019-06-20 12:15:59 +02:00
parent b91565e4c1
commit ad1d4b3c4a
6 changed files with 91 additions and 96 deletions

View File

@@ -6,7 +6,7 @@ RUN mkdir -p /app/code/nginx
WORKDIR /app/code
ENV MATRIXVERSION=v0.99.5.2
ENV MATRIXVERSION=v1.0.0
EXPOSE 8000
EXPOSE 3478/udp
@@ -19,26 +19,24 @@ RUN rm -rf /var/log/nginx && ln -sf /run/nginx_log /var/log/nginx
# TURN
RUN apt update && apt-get install -y coturn
RUN sed -e 's,#TURNSERVER_ENABLED=1,TURNSERVER_ENABLED=1,' -i /etc/default/coturn \
&& rm /etc/turnserver.conf \
&& ln -s /app/data/turnserver.conf /etc/turnserver.conf
RUN sed -e 's,#TURNSERVER_ENABLED=1,TURNSERVER_ENABLED=1,' -i /etc/default/coturn && \
rm /etc/turnserver.conf && \
ln -s /app/data/turnserver.conf /etc/turnserver.conf
# Synapse
# a local copy is needed because of the mail templates, else the pip installation would suffice
RUN git clone https://github.com/matrix-org/synapse.git
RUN cd /app/code/synapse && git pull origin master
RUN apt-get install -y build-essential python2.7-dev libffi-dev libldap2-dev libsasl2-dev \
python-pip python-setuptools sqlite3 \
libssl-dev libjpeg-dev libxslt1-dev
RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install psycopg2-binary py-bcrypt python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2
RUN pip install https://github.com/matrix-org/synapse/archive/${MATRIXVERSION}.tar.gz
#https://github.com/matrix-org/synapse/tarball/master
RUN apt-get install -y build-essential python3-dev libffi-dev \
python3-pip python-setuptools sqlite3 libxml2-dev \
libssl-dev python-virtualenv libjpeg-dev libxslt1-dev libldap2-dev libsasl2-dev && \
rm -rf /var/cache/apt /var/lib/apt/lists
# copy index.html
COPY index.html /app/code/nginx
RUN pip3 install --upgrade pip
RUN pip3 install --upgrade setuptools
RUN pip3 install psycopg2-binary python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2 bleach bcrypt
RUN pip3 install https://github.com/matrix-org/synapse/archive/${MATRIXVERSION}.tar.gz
RUN chown -R www-data.www-data /app/code