export variables

Merge pull request #166 from vector-im/dbkr/fix_nginx
Fix docker build
2021-12-20 21:00:06 +00:00 · 2021-12-20 20:24:53 +00:00 · 2021-12-20 20:05:05 +00:00 · 2021-12-20 18:47:07 +00:00 · 2021-12-20 18:43:45 +00:00
3 changed files with 19 additions and 5 deletions
--- a/10
+++ b/10
@@ -6,9 +6,13 @@ COPY . /src/matrix-video-chat
 RUN matrix-video-chat/scripts/dockerbuild.sh

 # App
-FROM nginx:alpine
+FROM nginxinc/nginx-unprivileged:alpine

 COPY --from=builder /src/matrix-video-chat/dist /app
+COPY scripts/default.conf /etc/nginx/conf.d/

-RUN rm -rf /usr/share/nginx/html \
-  && ln -s /app /usr/share/nginx/html
+USER root
+
+RUN rm -rf /usr/share/nginx/html
+
+USER 101
--- a/scripts/default.conf
+++ b/scripts/default.conf
@@ -0,0 +1,10 @@
+server {
+    listen       8080;
+    server_name  localhost;
+
+    location / {
+        root   /app;
+        try_files $uri /$uri /index.html;
+    }
+}
+
--- a/scripts/dockerbuild.sh
+++ b/scripts/dockerbuild.sh
@@ -2,8 +2,8 @@

 set -ex

-VITE_DEFAULT_HOMESERVER=https://call.ems.host
-VITE_SENTRY_DSN=https://b1e328d49be3402ba96101338989fb35@sentry.matrix.org/41
+export VITE_DEFAULT_HOMESERVER=https://call.ems.host
+export VITE_SENTRY_DSN=https://b1e328d49be3402ba96101338989fb35@sentry.matrix.org/41

 git clone https://github.com/matrix-org/matrix-js-sdk.git
 cd matrix-js-sdk
Author	SHA1	Message	Date
David Baker	b65874a6fc	export variables	2021-12-20 21:00:06 +00:00
David Baker	28b7e76ce0	Merge pull request #166 from vector-im/dbkr/fix_nginx Fix docker build	2021-12-20 20:24:53 +00:00
David Baker	31845dea10	Fix docker build and add catchall route	2021-12-20 20:05:05 +00:00
David Baker	b1a75a5033	Merge pull request #165 from vector-im/dbkr/nginx_unpriv Use unprivilged nginx image	2021-12-20 18:47:07 +00:00
David Baker	032d623acb	Use unprivilged nginx image	2021-12-20 18:43:45 +00:00