mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
fc931c82da
* Fix a crash on logout -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEE6Vt2megLaKnq2aGaK6qbhVK9kEcFAmG3aVQRHHJlbGVhc2Vz QHJpb3QuaW0ACgkQK6qbhVK9kEeWtw/+LZj8MwHznasjbMIP/xgt+CXYxZFepaiu r51yWSLFit6r3s6RKrN0TfwUUYR91w7Q3ZugefPIrSGcKvOVgUUVpfoEjbplfz1/ 2BuAidNiQazecDFW6yFFyVs7dyhxbswakHLAV+To5GbgeDdS66ajikpKi6t47han kUvjAFOp1aR1fYsSWqi6vCNqC5eQqZCuQkiqu0gG9s53/lOuMPRJyq7a+WQZp9+Z DpAfw8hSCpLdOSaqJKjYT5Lu/UQXcPnKT9ZamDcmOODdCGKdYdy2JPdrrTpT18ss +YmhX0hX16K7zZ8tubIg57DGpfvlG+zGPk+3WOrspv8UsD4beLDQ88GP4K/gK3/0 /WrRTtpVUpZUZNyG44bmQbcMvWuB8S8jaE/ofbD+LDb6AWgDx48djk+WdlYBlEvG ImZVoSgJRHs7TCm2JPrzk0QjCtPINlO7wzdTt3Of5OQdWSo0P4PN5EH6OFmNRjS1 aTU5CK4mAitWuH1SY+Vhzhj85y8/jdWseJw6bBhjLCyl++L4+KGc3ATGF5YP8z7V f4GU75ElWb1x3h0aNT5qaIGhgoIaZSIhSWli95D6sIofMXMe2pydBq3qD6YBcvEw 0YzAeVaUUh8UryAB7y4XRqZYJh2QyqD3wHVlbcOUjtVSQ3HYgSNKjV634ZjgAQWx zy+yVPgVkB4= =ceq2 -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQR6emmsWm8pV5k1AY7p6fZkQRCUPgUCYbdqngAKCRDp6fZkQRCU PkCDAQDbyk+Tx5VqPmgczSd0gt9s71+MJHAe9xIMx1c8ZbiJfgEA2AQrPTHOJccU XadauysgA9HLXaNcUuMrZyP/jtoH5wk= =6IqA -----END PGP SIGNATURE----- Merge tag 'v1.9.7' into sc * Security release with updated version of Olm to fix https://matrix.org/blog/2021/12/03/pre-disclosure-upcoming-security-release-of-libolm-and-matrix-js-sdk * Fix a crash on logout
38 lines
1.2 KiB
Docker
38 lines
1.2 KiB
Docker
# Builder
|
|
FROM node:14-buster as builder
|
|
|
|
# Support custom branches of the react-sdk and js-sdk. This also helps us build
|
|
# images of element-web develop.
|
|
ARG USE_CUSTOM_SDKS=yes
|
|
ARG REACT_SDK_REPO="https://github.com/SchildiChat/matrix-react-sdk.git"
|
|
ARG REACT_SDK_BRANCH="master"
|
|
ARG JS_SDK_REPO="https://github.com/SchildiChat/matrix-js-sdk.git"
|
|
ARG JS_SDK_BRANCH="master"
|
|
|
|
RUN apt-get update && apt-get install -y git dos2unix
|
|
|
|
WORKDIR /src
|
|
|
|
COPY . /src
|
|
RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
|
|
RUN yarn --network-timeout=100000 install
|
|
|
|
RUN dos2unix /src/scripts/docker-package.sh && bash /src/scripts/docker-package.sh
|
|
|
|
# Copy the config now so that we don't create another layer in the app image
|
|
RUN cp /src/config.sample.json /src/webapp/config.json
|
|
|
|
# App
|
|
FROM nginx:alpine
|
|
|
|
COPY --from=builder /src/webapp /app
|
|
|
|
# Insert wasm type into Nginx mime.types file so they load correctly.
|
|
RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
|
|
|
|
# Override default nginx config
|
|
COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
|
|
|
|
RUN rm -rf /usr/share/nginx/html \
|
|
&& ln -s /app /usr/share/nginx/html
|