add postgres image

Author: nadav867

database/.env

@@ -0,0 +1,3 @@
+POSTGRES_USER=admin
+POSTGRES_PASSWORD=admin
+POSTGRES_DB=pern_db

database/.gitignore

@@ -0,0 +1 @@
+data

database/initdb.sql

@@ -0,0 +1,12 @@
+CREATE TABLE Todolist
+(
+    TodoID int NOT NULL,
+    Todo varchar(255),
+    Completed boolean,
+    PRIMARY KEY(TodoID)
+);
+
+INSERT INTO Todolist
+VALUES
+    (1, 'add pgadmin4 image' , 'false')
+;

database/pgadmin/.env

@@ -0,0 +1,2 @@
+PGADMIN_DEFAULT_EMAIL=admin@admin.com
+PGADMIN_DEFAULT_PASSWORD=admin

docker-compose-dev.yml

@@ -1,20 +1,61 @@
-version: '3'
+version: '3.7'
 services:
+  ##############
+  ## POSTGRES ##
+  postgres_db:
+    image: postgres
+    networks:
+      - database
+    ports:
+      - 5432:5432
+    env_file:
+      - ./database/.env
+    restart: always
+    volumes:
+      - ./database/data:/var/lib/postgresql/data
+      - ./database/initdb.sql:/docker-entrypoint-initdb.d/init.sql
+    container_name: postgres_db
+  ###############
+  ## PG ADMIN ###
+  # pgadmin:
+  #   image: dpage/pgadmin4
+  #   ports:
+  #     - 5555:80
+  #   volumes:
+  #     - ./database/pgadmin/data:/var/lib/pgadmin
+  #   links:
+  #     - postgres_db
+  #   networks:
+  #     - database
+  #   depends_on:
+  #     - postgres_db
+  #   env_file:
+  #     - ./database/pgadmin/.env
+  #   container_name: pgadmin
+  #############
+  ## SERVER ##
   server:
     build:
       context: ./server
       dockerfile: Dockerfile.dev
     networks:
       - webapp
+      - database
     ports:
       - 5500:5500
     env_file:
       - ./server/.env
     volumes:
       - ./server/src:/app/src
+    links:
+      - postgres_db
+    depends_on:
+      - postgres_db
     restart: always
-    command: nodemon
+    command: ['./wait-for-it.sh', 'postgres_db:5432', '--', 'nodemon']
     container_name: server
+  #############
+  ## CLIENT ##
   client:
     build:
       context: ./client
@@ -27,13 +68,14 @@ services:
     networks:
       - webapp
     ports:
-      - 8080:3000
+      - 3000:3000
     command: npm start
     links:
       - server
     stdin_open: true
     container_name: client
-
 networks:
   webapp:
     driver: bridge
+  database:
+    driver: bridge

docker-compose.yml

@@ -1,12 +1,20 @@
 version: '3'
 services:
+  #############
+  ## SERVER ##
   server:
     build:
       context: ./server
       dockerfile: Dockerfile
     networks:
       - webapp
+      - database
+    depends_on:
+      - postgres_db
+    command: ['./wait-for-it.sh', 'postgres_db:5432', '--', 'node', 'index']
     container_name: server
+  #############
+  ## CLIENT ##
   client:
     build:
       context: ./client
@@ -18,7 +26,20 @@ services:
     links:
       - server
     container_name: client
+  ##############
+  ## POSTGRES ##
+  postgres_db:
+    image: postgres
+    networks:
+      - database
+    env_file:
+      - ./database/.env
+    volumes:
+      - ./database/db_data:/var/lib/postgresql/data/
+    container_name: postgres_db
 
 networks:
   webapp:
     driver: bridge
+  database:
+    driver: bridge

server/Dockerfile

@@ -10,12 +10,14 @@ RUN npm run build
 # move build to new container
 FROM node:12-alpine
 WORKDIR /app
+
 COPY --from=build /app/build /app/
 COPY package.json /app/package.json
+COPY wait-for-it.sh /app/wait-for-it.sh
+
 RUN npm install --silent
+RUN apk add --no-cache bash
 
 
 # start server
 EXPOSE 5500 
-USER node
-CMD ["node", "index.js"]

server/Dockerfile.dev

@@ -1,11 +1,12 @@
 FROM node:12-alpine
 
 WORKDIR /app
+
 COPY . /app
 
 RUN npm install -g nodemon --silent
 RUN npm install --silent
+RUN apk add --no-cache bash
 
 EXPOSE 5500
 
-CMD ["nodemon"]