diff --git a/Dockerfile b/Dockerfile index 513b917..5fde8af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,4 +35,5 @@ EXPOSE 3000 ENV PORT=3000 ENV HOSTNAME="0.0.0.0" -CMD ["sh", "-c", "cp -n prisma/schema.prisma /app/data/ 2>/dev/null; npx prisma migrate deploy 2>/dev/null || npx prisma db push --skip-generate; node server.js"] +ENV DATABASE_URL="file:/app/data/prod.db" +CMD ["sh", "-c", "npx prisma db push --skip-generate && node server.js"] diff --git a/Jenkinsfile b/Jenkinsfile index 71c1356..329e520 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,10 +27,12 @@ pipeline { sh """ docker stop ${APP_NAME} || true docker rm ${APP_NAME} || true + mkdir -p /data/${APP_NAME} docker run -d \ --name ${APP_NAME} \ -p 3000:3000 \ - -v ${APP_NAME}-data:/app/data \ + -v /data/${APP_NAME}:/app/data \ + -e DATABASE_URL=file:/app/data/prod.db \ --restart unless-stopped \ ${APP_NAME}:latest """ diff --git a/docker-compose.yml b/docker-compose.yml index 671e207..465ff74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,7 @@ services: ports: - "3000:3000" volumes: - - app-data:/app/data + - /data/no-whatever:/app/data environment: - - DATABASE_URL=file:/app/data/dev.db + - DATABASE_URL=file:/app/data/prod.db restart: unless-stopped - -volumes: - app-data: diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 07ad26e..f3a86b3 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,6 +1,6 @@ datasource db { provider = "sqlite" - url = "file:./dev.db" + url = env("DATABASE_URL") } generator client {