Merge remote-tracking branch 'origin/main' into migrate

Author: KaichiManabe

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+.env*

.env.sample

@@ -0,0 +1 @@
+SQL_GENERATE_URL=postgres://sql-url

.github/workflows/ci.yml

@@ -97,11 +97,3 @@ jobs:
       - uses: oven-sh/setup-bun@v2
       - run: bun prepare:deploy:web
       - run: test `ls web/.next | wc -l` != 0
-
-  deploy-test-server:
-    name: Deploy Test (server)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-      - run: bun prepare:deploy:server

.github/workflows/deploy.yml

@@ -0,0 +1,17 @@
+name: Deploy
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    name: Deploy Server to Fly.io
+    runs-on: ubuntu-latest
+    env:
+      SQL_GENERATE_URL: ${{ secrets.DATABASE_URL_FOR_PRISMA_SQL_GENERATION }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --build-arg SQL_GENERATE_URL=$SQL_GENERATE_URL --access-token "${{ secrets.FLY_DEPLOY_TOKEN }}"

Dockerfile

@@ -0,0 +1,33 @@
+# syntax = docker/dockerfile:1
+
+ARG BUN_VERSION=1.2.2
+FROM oven/bun:${BUN_VERSION} AS base
+LABEL fly_launch_runtime="Bun/Prisma"
+ENV NODE_ENV="production"
+
+# Throw-away build stage to reduce size of final image
+FROM base AS build
+
+WORKDIR /build
+ARG SQL_GENERATE_URL
+RUN test -n "${SQL_GENERATE_URL}"
+ENV DATABASE_URL=$SQL_GENERATE_URL
+ENV DIRECT_URL=$SQL_GENERATE_URL
+COPY . .
+RUN --mount=type=cache,target=~/.bun/install bun install --frozen-lockfile --ignore-scripts
+RUN cd server; bun prisma generate --sql
+RUN cd server; bun run :build
+
+
+# Final stage for app image
+FROM base AS runner
+WORKDIR /srv
+
+# Copy built application
+COPY --from=build /build/server/target/index.js /srv/index.js
+COPY --from=build /build/node_modules/.prisma/client /node_modules/.prisma/client
+COPY --from=build /build/node_modules/@img /node_modules/@img
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD [ "bun", "run", "./index.js" ]

README.md

@@ -72,6 +72,6 @@ make prepare-deploy-web`
 
 server:
 ```sh
-make prepare-deploy-server
-make deploy-server
+# prisma がビルド時に DATABASE_URL を要求するため、 root に .env を作って、 .env.sample に従って埋めよう。
+bun deploy:server
 ```

bun.lock

@@ -1,5 +1,7 @@
 {
   "name": "common",
+  "private": true,
+  "version": "1.0.0",
   "type": "module",
   "devDependencies": {
     "@types/bun": "latest"

common/package.json

@@ -39,6 +39,7 @@
         packages =
           (with pkgs; [
             nix # HACK: to fix the side effect of the hack below, installing two instances of nix
+            flyctl
             gnumake
             nodejs
             biome

flake.nix

@@ -0,0 +1,24 @@
+# fly.toml app configuration file generated for coursemate on 2025-03-06T14:33:10+09:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'coursemate'
+primary_region = 'nrt'
+
+[build]
+
+[deploy]
+
+[http_service]
+internal_port = 3000
+force_https = true
+auto_stop_machines = 'stop'
+auto_start_machines = true
+min_machines_running = 0
+processes = ['app']
+
+[[vm]]
+memory = '512mb'
+cpu_kind = 'shared'
+cpus = 1