Serve FE statically

.gitea/workflows/deploy.yaml

@@ -4,32 +4,53 @@ on:
   push:
     branches: [master]
 
+concurrency:
+  group: deploy-todo3
+  cancel-in-progress: false
+
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
     container:
       image: docker:latest
       volumes:
+        - /var/www/todo3:/deploy-fe
         - /opt/todo3:/deploy
     steps:
       - name: Install dependencies
-        run: apk add --no-cache git nodejs
+        run: apk add --no-cache git bash curl nodejs
+
+      - name: Install Bun
+        run: |
+          curl -fsSL https://bun.sh/install | bash
+          ln -s /root/.bun/bin/bun /usr/local/bin/bun
 
       - uses: actions/checkout@v4
 
-      - name: Copy source to deploy directory
+      - name: Install workspace dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Build frontend
+        run: bun run --filter fe build
+        env:
+          PUBLIC_WS_URL: ${{ vars.PUBLIC_WS_URL }}
+          PUBLIC_BOX_DRAWING_CHARS: ${{ vars.PUBLIC_BOX_DRAWING_CHARS }}
+
+      - name: Deploy frontend
+        run: |
+          rm -rf /deploy-fe/*
+          cp -r packages/fe/dist/* /deploy-fe/
+
+      - name: Copy source for backend build
         run: |
           rm -rf /deploy/build
+          mkdir -p /deploy/build
           cp -r . /deploy/build
 
       - name: Create .env file
         working-directory: /deploy/build
         run: |
           cat > .env << 'EOF'
-          PUBLIC_WS_URL=${{ vars.PUBLIC_WS_URL }}
-          PUBLIC_BOX_DRAWING_CHARS=${{ vars.PUBLIC_BOX_DRAWING_CHARS }}
-          HOST=${{ vars.HOST }}
-          FE_PORT=${{ vars.FE_PORT }}
           BE_PORT=${{ vars.BE_PORT }}
           JWT_SECRET=${{ secrets.JWT_SECRET }}
           SIGNUP_SECRET=${{ secrets.SIGNUP_SECRET }}
@@ -37,7 +58,7 @@ jobs:
           DATA_DIR=/opt/todo3/data
           EOF
 
-      - name: Build and deploy
+      - name: Build and deploy backend
         working-directory: /deploy/build
         run: |
           docker compose build

Dockerfile

@@ -7,23 +7,6 @@ COPY packages/fe/package.json packages/fe/
 COPY packages/be/package.json packages/be/
 RUN bun install --frozen-lockfile
 
-FROM deps AS fe-build
-COPY packages/fe packages/fe
-COPY packages/be/src packages/be/src
-COPY tsconfig.json .
-ARG PUBLIC_WS_URL
-ARG PUBLIC_BOX_DRAWING_CHARS
-ENV PUBLIC_WS_URL=$PUBLIC_WS_URL
-ENV PUBLIC_BOX_DRAWING_CHARS=$PUBLIC_BOX_DRAWING_CHARS
-RUN bun run --filter fe build
-
-FROM base AS frontend
-WORKDIR /app/packages/fe
-COPY --from=deps /app/node_modules /app/node_modules
-COPY --from=fe-build /app/packages/fe/dist ./dist
-COPY packages/fe/package.json packages/fe/vite.config.ts ./
-CMD ["bun", "run", "start"]
-
 FROM base AS backend
 WORKDIR /app/packages/be
 COPY --from=deps /app/node_modules /app/node_modules

docker-compose.yml

@@ -1,19 +1,6 @@
 name: todo3
 
 services:
-  fe:
-    build:
-      context: .
-      target: frontend
-      args:
-        PUBLIC_WS_URL: ${PUBLIC_WS_URL}
-        PUBLIC_BOX_DRAWING_CHARS: ${PUBLIC_BOX_DRAWING_CHARS:-─│┌┐└┘├┤}
-    ports:
-      - '${FE_PORT}:4173'
-    environment:
-      HOST: ${HOST}
-    restart: unless-stopped
-
   be:
     build:
       context: .