feat!: serve frontent with elysia

BREAKING CHANGE: The 2 previous containers have been merged into one

Author: koitococo

.github/workflows/docker-images.yml

@@ -10,23 +10,12 @@ on:
 env:
   REGISTRY: ghcr.io
   CN_REGISTRY: docker.cnb.cool
-
+  IMAGE_NAME: em-geeklab/nexusgate
+  CN_IMAGE_NAME: em-geeklab/nexusgate/server
 jobs:
   build-images:
     name: Build and push multi-arch images
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        image: 
-          - name: backend
-            dockerfile: backend.Dockerfile
-            image_name: em-geeklab/nexus-gate-server
-            cn_image_name: em-geeklab/nexusgate/server
-          - name: frontend
-            dockerfile: frontend.Dockerfile
-            image_name: em-geeklab/nexus-gate-web
-            cn_image_name: em-geeklab/nexusgate/web
     permissions:
       contents: read
       packages: write
@@ -57,8 +46,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ${{ env.REGISTRY }}/${{ matrix.image.image_name }}
-            ${{ github.event_name == 'release' && format('{0}/{1}', env.CN_REGISTRY, matrix.image.cn_image_name) || '' }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ github.event_name == 'release' && format('{0}/{1}', env.CN_REGISTRY, env.CN_IMAGE_NAME) || '' }}
       - name: Build and push Docker image
         id: push
         uses: docker/build-push-action@v6
@@ -67,11 +56,10 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          file: ${{ matrix.image.dockerfile }}
           platforms: linux/amd64,linux/arm64
           build-args: COMMIT_SHA=${{ github.sha }}
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2
         with:
-          subject-name: ${{ env.REGISTRY }}/${{ matrix.image.image_name }}
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.gitignore

@@ -13,4 +13,7 @@ node_modules
 # Some other stuff that should not be pushed to remote
 .local
 
-.env
+.env
+
+dist/
+out/

backend.Dockerfile Dockerfilebackend.Dockerfile renamed to Dockerfile

@@ -14,15 +14,24 @@ RUN --mount=type=cache,target=/cache \
     BUN_INSTALL_CACHE_DIR=/cache \
     bun install --frozen-lockfile --filter "!nexus-gate-docs"
 
-FROM deps AS builder
+FROM deps AS builder-common
 COPY . .
-RUN cd backend && bun build src/index.ts --target bun --outdir out/
+
+FROM builder-common AS builder-backend
+RUN cd backend && bun run build
+
+FROM builder-common AS builder-frontend
+ENV VITE_BASE_URL=/ VITE_COMMIT_SHA=${COMMIT_SHA}
+RUN cd frontend && bun run build
 
 FROM base AS runner 
 ARG COMMIT_SHA
 ENV COMMIT_SHA=${COMMIT_SHA}
-COPY --from=builder /app/backend/out/index.js /app/index.js
-COPY --from=builder /app/backend/drizzle /app/drizzle
+COPY --from=builder-backend /app/backend/out/index.js /app/index.js
+COPY --from=builder-backend /app/backend/drizzle /app/drizzle
+COPY --from=builder-frontend /app/frontend/dist /app/dist
+
 USER bun
 EXPOSE 3000/tcp
+
 ENTRYPOINT [ "bun", "run", "index.js" ]

Justfile

@@ -0,0 +1,18 @@
+deps:
+	bun install
+
+[working-directory: 'frontend']
+build-frontend: deps
+	bun run build
+
+[working-directory: 'backend']
+build-backend: deps
+	bun run build
+
+build-all: build-frontend build-backend
+
+dist: build-all
+	mkdir -p dist
+	cp -r backend/out/index.js dist/
+	cp -r backend/drizzle dist/
+	cp -r frontend/dist/ dist/

backend/src/index.ts

@@ -1,4 +1,4 @@
-import { Elysia } from "elysia";
+import { Elysia, t } from "elysia";
 import { cors } from "@elysiajs/cors";
 import { swagger } from "@elysiajs/swagger";
 import { serverTiming } from "@elysiajs/server-timing";
@@ -7,9 +7,16 @@ import { loggerPlugin } from "@/plugins/loggerPlugin";
 import { ALLOWED_ORIGINS, PORT, PRODUCTION } from "@/utils/config";
 import { consola } from "consola";
 import { initConfig } from "./utils/init";
+import { staticPlugin } from "@elysiajs/static";
+import { exists, readFile } from "node:fs/promises"
 
 await initConfig();
 
+let indexHtml = "";
+if (await exists("dist/index.html")) {
+  indexHtml = await readFile("dist/index.html", "utf-8");
+}
+
 const app = new Elysia()
   .use(loggerPlugin)
   .use(
@@ -36,13 +43,33 @@ const app = new Elysia()
           title: "NexusGate API Documentation",
           version: "0.0.1",
         },
-      }, 
+      },
       path: "/api/docs",
       specPath: "/api/openapi.json"
     }),
   )
   .use(serverTiming())
   .use(routes)
+  .use(staticPlugin({
+    assets: "dist",
+    alwaysStatic: true,
+    prefix: "/",
+  })).get("/*", ({ headers: { accept } }) => {
+    if (typeof accept === "string" && !accept.includes("text/html")) {
+      return new Response("Not Found", {
+        status: 404,
+      });
+    }
+    return new Response(indexHtml, {
+      headers: {
+        "Content-Type": "text/html",
+      },
+    });
+  }, {
+    headers: t.Object({
+      accept: t.Optional(t.String())
+    })
+  })
   .listen({
     port: PORT,
     reusePort: PRODUCTION,

bun.lock

@@ -19,7 +19,7 @@ services:
     image: "m.daocloud.io/docker.io/library/redis:latest"
     restart: on-failure
 
-  backend:
+  nexusgate:
     image: "docker.cnb.cool/em-geeklab/nexusgate/server:latest"
     environment:
       - "DATABASE_URL=postgres://nexusgate:${POSTGRES_PASSWORD:-change_me_in_production}@database:5432/nexusgate"
@@ -30,15 +30,4 @@ services:
       database:
         condition: service_healthy
       redis:
-        condition: service_started
-
-  frontend:
-    image: "docker.cnb.cool/em-geeklab/nexusgate/web:latest"
-    environment:
-      - "BACKEND_URL=http://backend:3000"
-    restart: on-failure
-    depends_on:
-      - backend
-    ports:
-      - "${WEB_PORT:-8080}:80"
- 
+        condition: service_started

docker-compose.cn.yaml

@@ -19,8 +19,8 @@ services:
     image: "redis:latest"
     restart: on-failure
 
-  backend:
-    image: "ghcr.io/em-geeklab/nexus-gate-server:latest"
+  nexusgate:
+    image: "ghcr.io/em-geeklab/nexusgate:latest"
     environment:
       - "DATABASE_URL=postgres://nexusgate:${POSTGRES_PASSWORD:-change_me_in_production}@database:5432/nexusgate"
       - "ADMIN_SUPER_SECRET=${ADMIN_SUPER_SECRET:-admin_key_change_in_production}"
@@ -30,15 +30,4 @@ services:
       database:
         condition: service_healthy
       redis:
-        condition: service_started
-
-  frontend:
-    image: "ghcr.io/em-geeklab/nexus-gate-web:latest"
-    environment:
-      - "BACKEND_URL=http://backend:3000"
-    restart: on-failure
-    depends_on:
-      - backend
-    ports:
-      - "${WEB_PORT:-8080}:80"
- 
+        condition: service_started

docker-compose.yaml

@@ -12,5 +12,8 @@
     "esbuild",
     "protobufjs",
     "sharp"
-  ]
+  ],
+  "dependencies": {
+    "@elysiajs/static": "^1.3.0"
+  }
 }