diff --git a/Dockerfile b/Dockerfile index f9730ea..d861918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS base +FROM node:20-slim AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" @@ -48,4 +48,4 @@ ENV MAX_REQUEST_PER_MINUTE=60 ENV AUTH_CODE="" ENV DATABASE_URL="" -CMD ["npm", "run", "start:migrate:prod"] \ No newline at end of file +CMD ["./docker-bootstrap.sh"] \ No newline at end of file diff --git a/apps/server/docker-bootstrap.sh b/apps/server/docker-bootstrap.sh new file mode 100644 index 0000000..9f43045 --- /dev/null +++ b/apps/server/docker-bootstrap.sh @@ -0,0 +1,8 @@ + +#!/bin/sh +# ENVIRONEMTN from docker-compose.yaml doesn't get through to subprocesses +# Need to explicit pass DATABASE_URL here, otherwise migration doesn't work +# Run migrations +DATABASE_URL=${DATABASE_URL} npx prisma migrate deploy +# start app +DATABASE_URL=${DATABASE_URL} node dist/main \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9e5115f..b101ff8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,8 @@ services: # 请修改为自己的密码 MYSQL_ROOT_PASSWORD: 123456 TZ: 'Asia/Shanghai' - ports: - - 3306:3306 + # ports: + # - 3306:3306 server: image: cooderl/wewe-rss-server:latest