Merge from the original repo

Author: M-Ayman

result/.dockerignore

@@ -3,17 +3,20 @@ FROM node:10-slim
 WORKDIR /app
 
 RUN npm install -g nodemon
+ADD package*.json /app/
 
-COPY package*.json ./
+#RUN npm config set registry http://registry.npmjs.org
+#RUN npm install && npm ls
 
 RUN npm ci \
  && npm cache clean --force \
  && mv /app/node_modules /node_modules
 
-COPY . .
 
-ENV PORT 80
+ADD . /app
 
+ENV PORT 80
 EXPOSE 80
 
 CMD ["node", "server.js"]
+

result/Dockerfile

@@ -47,9 +47,6 @@ services:
 
   db:
     image: postgres:9.4
-    environment:
-      POSTGRES_USER: "postgres"
-      POSTGRES_PASSWORD: "postgres"
     volumes:
       - "db-data:/var/lib/postgresql/data"
     networks: