Merge pull request #1 from mustyoshi/task/docker-cache

Docker Cache

.docker/docker-compose.yml

@@ -18,9 +18,6 @@ services:
     - ../backend:/usr/src/app/
     ports:
     - "9090:9090"
-    entrypoint:
-      - "bash"
-      - "start.sh"
     depends_on:
       - congress_postgres
     networks:
@@ -31,18 +28,17 @@ services:
     stdin_open: true
     environment:
     - STAGE=dev
+    - CHOKIDAR_USEPOLLING=true
     build:
       context: ../frontend
       dockerfile: .docker/Dockerfile
     volumes:
-    - ../frontend:/usr/src/app
+    - ../frontend/public:/usr/src/app/public
+    - ../frontend/src:/usr/src/app/src
     ports:
     - "80:3000"
     networks:
       parser:
-    entrypoint:
-    - "bash"
-    - "start.sh"
   # nginx:
   #   image: nginx
   #   ports:
@@ -63,10 +59,12 @@ services:
       POSTGRES_USER: parser
       POSTGRES_DB: us_code
     volumes:
-      - /opt/congress/postgres:/var/lib/postgresql/data
+      - postgres-volume:/var/lib/postgresql/data
     networks:
       parser:
 networks:
   parser:
     external:
-      name: docker_parser
+      name: docker_parser
+volumes:
+  postgres-volume:

.gitignore

@@ -1,2 +1,2 @@
 **.pyc
-**/node_modules
+**/node_modules

backend/.docker/Dockerfile

@@ -1,4 +1,4 @@
-from python:3.7.4-slim-stretch
+FROM python:3.7.4-slim-stretch
 
 RUN apt update
 RUN apt install wget -y
@@ -11,4 +11,6 @@ WORKDIR /usr/src/app
 
 EXPOSE 9090
 EXPOSE 80
-ENTRYPOINT ["bash"]
+
+ENTRYPOINT "python"
+CMD ["-m", "billparser"]

frontend/.docker/Dockerfile

@@ -1,12 +1,14 @@
 FROM node
 
 RUN curl -o- -L https://yarnpkg.com/install.sh | bash
-WORKDIR /usr/src/app
 
+COPY package.json /usr/src/app/package.json
 COPY yarn.lock /usr/src/app/yarn.lock
+WORKDIR /usr/src/app
 RUN yarn install
 
-COPY . /usr/src/app
-
+COPY ./src /usr/src/app/src
+COPY ./public /usr/src/app/public
+COPY ./start.sh /usr/src/app/start.sh
 
-ENTRYPOINT [ "bash" ]
+ENTRYPOINT ["bash", "start.sh"]