fix all

Author: aster-void

Dockerfile

@@ -1,14 +1,12 @@
 # syntax = docker/dockerfile:1
 
 ARG BUN_VERSION=1.2.2
-FROM oven/bun:${BUN_VERSION}-slim AS base
+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
-# RUN apt-get update -qq && \
-    # apt-get install --no-install-recommends -y build-essential openssl pkg-config
 
 WORKDIR /build
 ARG SQL_GENERATE_URL
@@ -24,13 +22,10 @@ RUN cd server; bun run :build
 FROM base AS runner
 WORKDIR /srv
 
-# Install packages needed for deployment
-RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y openssl && \
-    rm -rf /var/lib/apt/lists /var/cache/apt/archives
-
 # 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

README.md

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

package.json

@@ -29,7 +29,8 @@
     "seed": "cd server; bun prisma db seed",
     "prepare:deploy:web": "bun install && bun run build:web",
     "deploy:web": "cd web; bun run start --port $PORT",
-    "deploy:server": "fly deploy --build-arg SQL_GENERATE_URL=$SQL_GENERATE_URL",
+    "deploy:server": "bun run --env-file=.env :deploy:server",
+    ":deploy:server": "fly deploy --build-arg SQL_GENERATE_URL=$SQL_GENERATE_URL",
     "docker:server": "docker build . --build-arg SQL_GENERATE_URL=$SQL_GENERATE_URL",
     "dev-db": "make dev-db",
     "test": "make test",