api: fix api specs using wrong db inside container
Parents:
a1fd0526 file(s) changed
- api/.env.development +3 -0
- api/.env.test +1 -0
- api/.gitignore +1 -0
- api/Dockerfile +4 -0
- api/package.json +3 -3
- docker-compose.yml +1 -1
api/.env.development
@@ -0,0 +1,3 @@
1 + DATABASE_URL="postgres://user:password@orbit_db:5432/orbit_dev"
2 + JWT_SECRET="sky-is-crying"
3 + FRONTEND_URL=http://192.168.3.96:8000
api/.env.test
@@ -1,3 +1,4 @@
1 1 DATABASE_URL="postgres://user:password@orbit_db:5432/orbit_test"
2 + NODE_ENV=test
2 3 JWT_SECRET="test-secret-key"
3 4 FRONTEND_URL=http://localhost:8081
api/.gitignore
@@ -1,4 +1,5 @@
1 1 node_modules
2 2 .env
3 + .env.development
3 4 src/generated/prisma
4 5 orbit.db
api/Dockerfile
@@ -13,6 +13,10 @@ COPY --chown="${UID}:${GID}" package*.json .
13 13
14 14 RUN npm i --frozen-lockfile
15 15
16 + COPY --chown="${UID}:${GID}" prisma ./prisma/
17 +
18 + RUN npx prisma generate
19 +
16 20 COPY --chown="${UID}:${GID}" . .
17 21
18 22 EXPOSE 3000
api/package.json
@@ -11,10 +11,10 @@ },
11 11 "scripts": {
12 12 "build": "tsc && tsc-alias",
13 13 "start": "ts-node -r tsconfig-paths/register src/index.ts",
14 - "test": "npm run test:setup && NODE_ENV=test npx ava",
14 + "test": "npm run test:setup && dotenv -e .env.test -o -- npx ava",
15 15 "test:setup": "npm run test:setup:generate && npm run test:setup:migrate",
16 - "test:setup:generate": "dotenv -e .env.test npx prisma generate",
17 - "test:setup:migrate": "dotenv -e .env.test npx prisma db push",
16 + "test:setup:generate": "dotenv -e .env.test -o -- npx prisma generate",
17 + "test:setup:migrate": "dotenv -e .env.test -o -- npx prisma db push",
18 18 "test:watch": "npm run test:setup && NODE_ENV=test npx ava --watch",
19 19 "dev": "prisma generate && prisma migrate deploy && npm run start"
20 20 },
docker-compose.yml
@@ -26,7 +26,7 @@ - /app/node_modules
26 26 ports:
27 27 - 3000:3000
28 28 env_file:
29 - - api/.env
29 + - api/.env.development
30 30 depends_on:
31 31 orbit_db:
32 32 condition: service_healthy