From 5b913205af83edfd3cbb98051b6ac20b91e10461 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 May 2022 11:39:48 +0100 Subject: [PATCH 1/3] Add redirects to netlify deployment --- .github/workflows/netlify-main.yaml | 3 +++ scripts/netlify_redirects | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 scripts/netlify_redirects diff --git a/.github/workflows/netlify-main.yaml b/.github/workflows/netlify-main.yaml index a9ab069..f2b191f 100644 --- a/.github/workflows/netlify-main.yaml +++ b/.github/workflows/netlify-main.yaml @@ -45,6 +45,9 @@ jobs: - name: Extract Artifacts run: unzip -d dist build.zip && rm build.zip + - name: Copy redirects file + run: cp scripts/netlify_redirects dist/_redirects + - name: Deploy to Netlify id: netlify uses: nwtgck/actions-netlify@v1.2.3 diff --git a/scripts/netlify_redirects b/scripts/netlify_redirects new file mode 100644 index 0000000..defe316 --- /dev/null +++ b/scripts/netlify_redirects @@ -0,0 +1,2 @@ +# Copied to the netlify deploy dir in the upload stage +/* /index.html 200 From 6d7be57dcf2d07a695a405d5c858e0f82733f06a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 May 2022 11:42:17 +0100 Subject: [PATCH 2/3] More comments --- scripts/netlify_redirects | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/netlify_redirects b/scripts/netlify_redirects index defe316..b84670e 100644 --- a/scripts/netlify_redirects +++ b/scripts/netlify_redirects @@ -1,2 +1,4 @@ -# Copied to the netlify deploy dir in the upload stage +# This file is copied to the netlify deploy dir in the upload stage + +# Redirect any unknown path to index.html /* /index.html 200 From 0d3daf5fa3d830e52709bea69157ac78b7a18367 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 11 May 2022 12:11:49 +0100 Subject: [PATCH 3/3] move config files into config/ --- .github/workflows/netlify-main.yaml | 2 +- Dockerfile | 2 +- {scripts => config}/default.conf | 0 {scripts => config}/netlify_redirects | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => config}/default.conf (100%) rename {scripts => config}/netlify_redirects (100%) diff --git a/.github/workflows/netlify-main.yaml b/.github/workflows/netlify-main.yaml index f2b191f..d05edbf 100644 --- a/.github/workflows/netlify-main.yaml +++ b/.github/workflows/netlify-main.yaml @@ -46,7 +46,7 @@ jobs: run: unzip -d dist build.zip && rm build.zip - name: Copy redirects file - run: cp scripts/netlify_redirects dist/_redirects + run: cp config/netlify_redirects dist/_redirects - name: Deploy to Netlify id: netlify diff --git a/Dockerfile b/Dockerfile index 6125b97..e31506c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN element-call/scripts/dockerbuild.sh FROM nginxinc/nginx-unprivileged:alpine COPY --from=builder /src/element-call/dist /app -COPY scripts/default.conf /etc/nginx/conf.d/ +COPY config/default.conf /etc/nginx/conf.d/ USER root diff --git a/scripts/default.conf b/config/default.conf similarity index 100% rename from scripts/default.conf rename to config/default.conf diff --git a/scripts/netlify_redirects b/config/netlify_redirects similarity index 100% rename from scripts/netlify_redirects rename to config/netlify_redirects