Update docker

Author: tduyng

.env.test.example

@@ -0,0 +1,13 @@
+NODE_ENV=test
+SERVER_PORT=1778
+DB_CONNECTOR=postgres
+DB_HOST=postgres
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_DATABASE=nest_graphql_test
+DB_PORT=5432
+PGADMIN_DEFAULT_EMAIL=admin@admin.com
+PGADMIN_DEFAULT_PASSWORD=admin
+
+
+DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_DATABASE}?schema=public

docker-compose.production.yml

@@ -1,6 +1,6 @@
 version: '3.8'
 services:
-  nest-api-prod:
+  nest-api:
     container_name: nest-graphql-api-prod
     build:
       context: .
@@ -13,35 +13,12 @@ services:
     networks:
       - nest-graphql-network
 
-  prisma:
-    image: prismagraphql/prisma:latest
-    ports:
-      - '4466:4466'
-    depends_on:
-      - postgres
-    env_file:
-      - ".env"
-    environment:
-      PRISMA_CONFIG: |
-        port: 4466
-        databases:
-          default:
-            connector: ${DB_CONNECTOR}
-            host: ${DB_HOST}
-            port: ${DB_PORT}
-            user: ${DB_USER}
-            password: ${DB_PASSWORD}
-    networks:
-      - nest-graphql-network
-    logging:
-      driver: none
-
-
   postgres:
     image: postgres:latest
+    container_name: nest-postgres
     restart: always
     env_file:
-      - ".env"
+      - .env.production
     environment:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
@@ -53,22 +30,6 @@ services:
     logging:
       driver: none
 
-  pgadmin:
-    links:
-    - postgres:postgres
-    container_name: pgadmin
-    image: dpage/pgadmin4
-    restart: unless-stopped
-    ports:
-      - '8080:80'
-    volumes:
-      - /data/pgadmin:/root/.pgadmin
-    env_file:
-      - .env
-    networks:
-      - nest-graphql-network
-    logging:
-      driver: none
 
   nest-nginx:
     container_name: nest-nginx

docker-compose.test.yml

@@ -0,0 +1,62 @@
+version: '3.8'
+services:
+  nest-api:
+    container_name: nest-graphql-api-test
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    volumes:
+      - .:/usr/src/app
+      - /usr/src/app/node_modules
+    depends_on:
+      - postgres
+    networks:
+      - nest-graphql-network
+
+
+  postgres:
+    image: postgres:latest
+    container_name: nest-postgres-test
+    restart: always
+    env_file:
+      - .env.test
+    expose:
+      - 5434
+    ports:
+      - 5434:5432
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_DATABASE}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - nest-graphql-network
+    logging:
+      driver: none
+
+  pgadmin:
+    links:
+    - postgres:postgres
+    container_name: nest-pgadmin
+    image: dpage/pgadmin4
+    restart: unless-stopped
+    ports:
+      - '8080:80'
+    volumes:
+      - /data/pgadmin:/root/.pgadmin
+    env_file:
+      - .env
+    networks:
+      - nest-graphql-network
+    logging:
+      driver: none
+
+
+volumes:
+  postgres_data:
+    driver: local
+networks:
+  nest-graphql-network:
+    driver: bridge
+    name: nest-graphql-network

docker-compose.yml

@@ -13,32 +13,10 @@ services:
     networks:
       - nest-graphql-network
 
-  prisma:
-    image: prismagraphql/prisma:latest
-    ports:
-      - '4466:4466'
-    depends_on:
-      - postgres
-    env_file:
-      - ".env"
-    environment:
-      PRISMA_CONFIG: |
-        port: 4466
-        databases:
-          default:
-            connector: ${DB_CONNECTOR}
-            host: ${DB_HOST}
-            port: ${DB_PORT}
-            user: ${DB_USER}
-            password: ${DB_PASSWORD}
-    networks:
-      - nest-graphql-network
-    logging:
-      driver: none
-
 
   postgres:
     image: postgres:latest
+    container_name: nest-postgres
     restart: always
     env_file:
       - ".env"
@@ -56,7 +34,7 @@ services:
   pgadmin:
     links:
     - postgres:postgres
-    container_name: pgadmin
+    container_name: nest-pgadmin
     image: dpage/pgadmin4
     restart: unless-stopped
     ports:

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts:alpine
+FROM node:lts-alpine
 
 WORKDIR /usr/src/app
 
@@ -10,4 +10,4 @@ RUN yarn prisma generate
 
 COPY . ./
 
-CMD ["yarn", "start:dev"]
+CMD ["yarn", "start:dev"]

docker/Dockerfile.prod

@@ -0,0 +1,13 @@
+FROM node:lts-alpine
+
+WORKDIR /usr/src/app
+
+COPY package*.json yarn.lock ./
+COPY prisma ./prisma/
+
+RUN yarn install
+RUN yarn prisma generate
+
+COPY . ./
+
+CMD ["yarn", "start:prod"]