OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #16838 from vector-im/revert-16698-gzip-static 

Revert "Docker image: serve pre-compressed assets using gzip_static"
pull/16882/head
Travis Ralston 2021-04-01 07:26:03 -06:00 committed by GitHub
parent 184efbbc44 dfa70b0637
commit 3f0f077ced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -27,11 +27,6 @@ RUN cp /src/config.sample.json /src/webapp/config.json
# Ensure we populate the version file # Ensure we populate the version file
RUN dos2unix /src/scripts/docker-write-version.sh && bash /src/scripts/docker-write-version.sh RUN dos2unix /src/scripts/docker-write-version.sh && bash /src/scripts/docker-write-version.sh
# Pre-compress for gzip_static
RUN find /src/webapp -type f \
\( -iname '*.css' -o -iname '*.js' -o -iname '*.json' -o -iname '*.html' \
-o -iname '*.svg' -o -iname '*.ttf' -o -iname '*.wasm' \) \
-exec gzip -9 -k {} \; -exec touch -r {} {}.gz \;
# App # App
FROM nginx:alpine FROM nginx:alpine
@ -39,8 +34,7 @@ FROM nginx:alpine
COPY --from=builder /src/webapp /app COPY --from=builder /src/webapp /app
# Insert wasm type into Nginx mime.types file so they load correctly. # Insert wasm type into Nginx mime.types file so they load correctly.
RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types \ RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
&& sed -i '2i\ gzip_static on\;' /etc/nginx/conf.d/default.conf
RUN rm -rf /usr/share/nginx/html \ RUN rm -rf /usr/share/nginx/html \
&& ln -s /app /usr/share/nginx/html && ln -s /app /usr/share/nginx/html