Fix nginx and docker config

mieweb · Oct 22, 2023 · d867e42 · d867e42
1 parent 82f32b9
commit d867e42
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/DevelopServerDeploy.yml b/.github/workflows/DevelopServerDeploy.yml
@@ -72,6 +72,7 @@ jobs:
           -v /home/githubactions/wikigdrive/service_account.json:/service_account.json \
           -v /home/githubactions/wikigdrive/env.develop:/usr/src/app/.env \
           -v /var/run/docker.sock:/var/run/docker.sock \
+          -v "/var/www/dev.wikigdrive.com:/usr/src/app/dist/hugo" \
           -e "GIT_SHA=${GITHUB_SHA}" \
           -e "ZIPKIN_URL=https://dev.wikigdrive.com/zipkin" \
           -e "ZIPKIN_SERVICE=wikigdrive-develop" \

diff --git a/.github/workflows/ProdServerDeploy.yml b/.github/workflows/ProdServerDeploy.yml
@@ -72,6 +72,7 @@ jobs:
           -v /home/githubactions/wikigdrive/service_account.json:/service_account.json \
           -v /home/githubactions/wikigdrive/env.prod:/usr/src/app/.env \
           -v /var/run/docker.sock:/var/run/docker.sock \
+          -v "/var/www/wikigdrive.com:/usr/src/app/dist/hugo" \
           -e "GIT_SHA=${GITHUB_SHA}" \
           --publish 127.0.0.1:3000:3000 \
           --restart unless-stopped \

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,8 @@ RUN npm link --location=user
 EXPOSE 3000
 VOLUME /data
 
-RUN cd /usr/src/app/apps/ui && cp ../../hugo/themes/wgd-bootstrap/layouts/_default/baseof.html index.html && npm install && npm run build
+RUN cp /usr/src/app/dist/hugo/ui/index.html /usr/src/app/index.html || cp /usr/src/app/hugo/themes/wgd-bootstrap/layouts/_default/baseof.html /usr/src/app/index.html
+RUN cd /usr/src/app/apps/ui && npm install && npm run build
 
 WORKDIR "/usr/src/app"
 

diff --git a/src/containers/server/static.ts b/src/containers/server/static.ts
@@ -10,7 +10,7 @@ const MAIN_DIR = __dirname + '/../../..';
 
 export async function handleStaticHtml(app: express.Application, reqPath: string, url: string) {
   const hugoPath = path.resolve(MAIN_DIR, 'dist', 'hugo', (reqPath.substring(1) || 'index.html'));
-  const generatedHtmlPath = path.resolve(MAIN_DIR, 'dist', 'hugo', 'index.html');
+  const generatedHtmlPath = path.resolve(MAIN_DIR, 'dist', 'hugo', 'ui', 'index.html');
   const distPath = path.resolve(HTML_DIR, 'dist');
   const baseHtmlPath = path.resolve(MAIN_DIR, 'hugo', 'themes', 'wgd-bootstrap', 'layouts', '_default', 'baseof.html');
 

diff --git a/website/ui.md b/website/ui.md
@@ -0,0 +1,3 @@
+---
+# ui/index.html
+---