From 3c6259cc88ec8ccfe8b158d2288024af80ab0403 Mon Sep 17 00:00:00 2001 From: Aine Date: Tue, 3 Sep 2024 14:04:32 +0300 Subject: [PATCH] Revert "switch from nginx to SWS for serving the app (docker image)", as it causes issues with CDN deploy - workflow should be adjusted first This reverts commit 317df5af0f59052869f4cd43cfb7d9830da416ef. --- .github/workflows/workflow.yml | 2 +- Dockerfile | 7 ++++--- README.md | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 991a5dc..e16298c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -4,7 +4,7 @@ on: branches: [ "main" ] env: upstream_version: v0.10.3 - etke_version: etke7 + etke_version: etke6 bunny_version: v0.1.0 permissions: checks: write diff --git a/Dockerfile b/Dockerfile index ac4b6ec..7744941 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,9 @@ COPY . /src RUN yarn build --base=$BASE_PATH # App -FROM ghcr.io/static-web-server/static-web-server:2 - -ENV SERVER_ROOT /app +FROM nginx:stable-alpine COPY --from=builder /src/dist /app + +RUN rm -rf /usr/share/nginx/html \ + && ln -s /app /usr/share/nginx/html diff --git a/README.md b/README.md index 938de0f..1aacb7f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ The following changes are already implemented: * [Add ability to toggle whether to show locked users](https://github.com/Awesome-Technologies/synapse-admin/pull/573) * [Fix user's display name in header on user's page](https://github.com/etkecc/synapse-admin/pull/9) * [Fix footer overlapping content](https://github.com/Awesome-Technologies/synapse-admin/issues/574) -* Switch from nginx to [SWS](https://static-web-server.net/) for serving the app _the list will be updated as new changes are added_