Updated docker

client/Dockerfile

@@ -3,10 +3,8 @@ FROM node:10-alpine
 RUN mkdir -p /app
 WORKDIR /app
 
-COPY package*.json /app
-RUN npm install
-
-COPY . /app
+COPY . .
 
+RUN npm install
 
 CMD ["npm", "start"]
\ No newline at end of file

client/src/components/home.component.js

@@ -31,10 +31,10 @@ export default class Home extends Component {
 
   getFormattedDate(date) {
     var timestamp = Date.parse(date);
-    var date = new Date(timestamp);
-    var dd = String(date.getDate()).padStart(2, '0');
-    var mm = String(date.getMonth() + 1).padStart(2, '0');
-    var yyyy = date.getFullYear();
+    var formatDate = new Date(timestamp);
+    var dd = String(formatDate.getDate()).padStart(2, '0');
+    var mm = String(formatDate.getMonth() + 1).padStart(2, '0');
+    var yyyy = formatDate.getFullYear();
     
     return dd + '/' + mm + '/' + yyyy;
 }

docker-compose.yml

@@ -18,6 +18,7 @@ services:
     restart: unless-stopped
     volumes:
       - ./db/sample.sql:/docker-entrypoint-initdb.d/sample.sql
+
   phpmyadmin:
     depends_on:
       - mysql
@@ -29,6 +30,7 @@ services:
     ports:
       - 8080:80
     restart: always
+
   server:
     build: ./server
     depends_on:
@@ -41,10 +43,11 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - ./server:/app
+      - ./server:/usr/src/app/
     links:
       - mysql
     command: npm start
+
   client:
     build: ./client
     environment:
@@ -54,8 +57,6 @@ services:
       - 3000
     ports:
       - 3000:3000
-    volumes:
-      - ./client/src:/app/src
     links:
       - server
     command: npm start

server/Dockerfile

 FROM node:10-alpine
 
-RUN npm install -g nodemon
-RUN npm install cors --save
-RUN npm install express --save
-RUN npm install mysql --save
+WORKDIR /usr/src/app
 
-RUN mkdir -p /app
-WORKDIR /app
+RUN npm install
 
-#COPY app/package.json app/package2.json
-COPY package*.json /app
+COPY package*.json /usr/src/app
 RUN npm install
 
-COPY . /app
+COPY . /usr/src/app
 
 CMD ["npm", "start"]
\ No newline at end of file