From 1640191d7fc20fac37f0c998cf1fdd126f5e445b Mon Sep 17 00:00:00 2001 From: Brooks Ryba Date: Thu, 21 Nov 2019 18:43:43 -0500 Subject: [PATCH 1/3] Add caching to front-end --- .docker/docker-compose.yml | 12 +- .gitignore | 1 + backend/.docker/Dockerfile | 6 +- backend/.docker/docker-compose.yaml | 25 ---- backend/start.sh | 1 - frontend/.docker/Dockerfile | 10 +- frontend/.docker/docker-compose.yaml | 33 ----- "tart.sh\"" | 181 +++++++++++++++++++++++++++ 8 files changed, 196 insertions(+), 73 deletions(-) delete mode 100644 backend/.docker/docker-compose.yaml delete mode 100644 backend/start.sh delete mode 100644 frontend/.docker/docker-compose.yaml create mode 100644 "tart.sh\"" diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 4c597bf9..21d14c1b 100644 --- a/.docker/docker-compose.yml +++ b/.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,7 +59,7 @@ services: POSTGRES_USER: parser POSTGRES_DB: us_code volumes: - - /opt/congress/postgres:/var/lib/postgresql/data + - ../volumes/postgres:/var/lib/postgresql/data networks: parser: networks: diff --git a/.gitignore b/.gitignore index c4fac4e9..315c97c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **.pyc **/node_modules +volumes/ \ No newline at end of file diff --git a/backend/.docker/Dockerfile b/backend/.docker/Dockerfile index 8cd82006..4e719912 100644 --- a/backend/.docker/Dockerfile +++ b/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"] \ No newline at end of file + +ENTRYPOINT "python" +CMD ["-m", "billparser"] \ No newline at end of file diff --git a/backend/.docker/docker-compose.yaml b/backend/.docker/docker-compose.yaml deleted file mode 100644 index 53549d94..00000000 --- a/backend/.docker/docker-compose.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3' -services: - parser_api: - tty: true - stdin_open: true - environment: - - STAGE=dev - - PORT=9090 - - db_host=10.0.0.174:5432 - - db_user=parser - - db_pass=parser - - db_table=us_code - build: - context: ../ - dockerfile: .docker/Dockerfile - network_mode: "host" - volumes: - - ../:/usr/src/app/ - ports: - - "9090:9090" - entrypoint: - - "bash" -volumes: - parser-pg-data: - driver: local \ No newline at end of file diff --git a/backend/start.sh b/backend/start.sh deleted file mode 100644 index fc7fbf35..00000000 --- a/backend/start.sh +++ /dev/null @@ -1 +0,0 @@ -python3 -m billparser \ No newline at end of file diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile index ce77c695..6d0d4dd3 100644 --- a/frontend/.docker/Dockerfile +++ b/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" ] \ No newline at end of file +ENTRYPOINT ["bash", "start.sh"] \ No newline at end of file diff --git a/frontend/.docker/docker-compose.yaml b/frontend/.docker/docker-compose.yaml deleted file mode 100644 index e20cd4a1..00000000 --- a/frontend/.docker/docker-compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3" -services: - viewer_app: - tty: true - stdin_open: true - environment: - - STAGE=dev - build: - context: ../ - dockerfile: .docker/Dockerfile - volumes: - - ../:/usr/src/app - ports: - - "80:3000" - networks: - parser: - entrypoint: - - "yarn" - - "start" - nginx: - image: nginx - ports: - - 80:80 - - 443:443 - networks: - parser: - volumes: - - /etc/letsencrypt:/etc/letsencrypt - - ./nginx/:/etc/nginx/sites-enabled/ -networks: - parser: - external: - name: docker_parser \ No newline at end of file diff --git "a/tart.sh\"" "b/tart.sh\"" new file mode 100644 index 00000000..360f687b --- /dev/null +++ "b/tart.sh\"" @@ -0,0 +1,181 @@ +warning: LF will be replaced by CRLF in frontend/start.sh. +The file will have its original line endings in your working directory. +diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml +index 4c597bf..21d14c1 100644 +--- a/.docker/docker-compose.yml ++++ b/.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,7 +59,7 @@ services: + POSTGRES_USER: parser + POSTGRES_DB: us_code + volumes: +- - /opt/congress/postgres:/var/lib/postgresql/data ++ - ../volumes/postgres:/var/lib/postgresql/data + networks: + parser: + networks: +diff --git a/.gitignore b/.gitignore +index c4fac4e..315c97c 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,2 +1,3 @@ + **.pyc + **/node_modules ++volumes/ +\ No newline at end of file +diff --git a/backend/.docker/Dockerfile b/backend/.docker/Dockerfile +index 8cd8200..4e71991 100644 +--- a/backend/.docker/Dockerfile ++++ b/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"] +\ No newline at end of file ++ ++ENTRYPOINT "python" ++CMD ["-m", "billparser"] +\ No newline at end of file +diff --git a/backend/.docker/docker-compose.yaml b/backend/.docker/docker-compose.yaml +deleted file mode 100644 +index 53549d9..0000000 +--- a/backend/.docker/docker-compose.yaml ++++ /dev/null +@@ -1,25 +0,0 @@ +-version: '3' +-services: +- parser_api: +- tty: true +- stdin_open: true +- environment: +- - STAGE=dev +- - PORT=9090 +- - db_host=10.0.0.174:5432 +- - db_user=parser +- - db_pass=parser +- - db_table=us_code +- build: +- context: ../ +- dockerfile: .docker/Dockerfile +- network_mode: "host" +- volumes: +- - ../:/usr/src/app/ +- ports: +- - "9090:9090" +- entrypoint: +- - "bash" +-volumes: +- parser-pg-data: +- driver: local +\ No newline at end of file +diff --git a/backend/start.sh b/backend/start.sh +deleted file mode 100644 +index fc7fbf3..0000000 +--- a/backend/start.sh ++++ /dev/null +@@ -1 +0,0 @@ +-python3 -m billparser +\ No newline at end of file +diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile +index ce77c69..6d0d4dd 100644 +--- a/frontend/.docker/Dockerfile ++++ b/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" ] +\ No newline at end of file ++ENTRYPOINT ["bash", "start.sh"] +\ No newline at end of file +diff --git a/frontend/.docker/docker-compose.yaml b/frontend/.docker/docker-compose.yaml +deleted file mode 100644 +index e20cd4a..0000000 +--- a/frontend/.docker/docker-compose.yaml ++++ /dev/null +@@ -1,33 +0,0 @@ +-version: "3" +-services: +- viewer_app: +- tty: true +- stdin_open: true +- environment: +- - STAGE=dev +- build: +- context: ../ +- dockerfile: .docker/Dockerfile +- volumes: +- - ../:/usr/src/app +- ports: +- - "80:3000" +- networks: +- parser: +- entrypoint: +- - "yarn" +- - "start" +- nginx: +- image: nginx +- ports: +- - 80:80 +- - 443:443 +- networks: +- parser: +- volumes: +- - /etc/letsencrypt:/etc/letsencrypt +- - ./nginx/:/etc/nginx/sites-enabled/ +-networks: +- parser: +- external: +- name: docker_parser +\ No newline at end of file From 61c2f5fa01c13dba20ac76efd011503504fc271d Mon Sep 17 00:00:00 2001 From: Brooks Ryba Date: Thu, 21 Nov 2019 18:44:03 -0500 Subject: [PATCH 2/3] remove bunk file --- "tart.sh\"" | 181 ---------------------------------------------------- 1 file changed, 181 deletions(-) delete mode 100644 "tart.sh\"" diff --git "a/tart.sh\"" "b/tart.sh\"" deleted file mode 100644 index 360f687b..00000000 --- "a/tart.sh\"" +++ /dev/null @@ -1,181 +0,0 @@ -warning: LF will be replaced by CRLF in frontend/start.sh. -The file will have its original line endings in your working directory. -diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml -index 4c597bf..21d14c1 100644 ---- a/.docker/docker-compose.yml -+++ b/.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,7 +59,7 @@ services: - POSTGRES_USER: parser - POSTGRES_DB: us_code - volumes: -- - /opt/congress/postgres:/var/lib/postgresql/data -+ - ../volumes/postgres:/var/lib/postgresql/data - networks: - parser: - networks: -diff --git a/.gitignore b/.gitignore -index c4fac4e..315c97c 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,2 +1,3 @@ - **.pyc - **/node_modules -+volumes/ -\ No newline at end of file -diff --git a/backend/.docker/Dockerfile b/backend/.docker/Dockerfile -index 8cd8200..4e71991 100644 ---- a/backend/.docker/Dockerfile -+++ b/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"] -\ No newline at end of file -+ -+ENTRYPOINT "python" -+CMD ["-m", "billparser"] -\ No newline at end of file -diff --git a/backend/.docker/docker-compose.yaml b/backend/.docker/docker-compose.yaml -deleted file mode 100644 -index 53549d9..0000000 ---- a/backend/.docker/docker-compose.yaml -+++ /dev/null -@@ -1,25 +0,0 @@ --version: '3' --services: -- parser_api: -- tty: true -- stdin_open: true -- environment: -- - STAGE=dev -- - PORT=9090 -- - db_host=10.0.0.174:5432 -- - db_user=parser -- - db_pass=parser -- - db_table=us_code -- build: -- context: ../ -- dockerfile: .docker/Dockerfile -- network_mode: "host" -- volumes: -- - ../:/usr/src/app/ -- ports: -- - "9090:9090" -- entrypoint: -- - "bash" --volumes: -- parser-pg-data: -- driver: local -\ No newline at end of file -diff --git a/backend/start.sh b/backend/start.sh -deleted file mode 100644 -index fc7fbf3..0000000 ---- a/backend/start.sh -+++ /dev/null -@@ -1 +0,0 @@ --python3 -m billparser -\ No newline at end of file -diff --git a/frontend/.docker/Dockerfile b/frontend/.docker/Dockerfile -index ce77c69..6d0d4dd 100644 ---- a/frontend/.docker/Dockerfile -+++ b/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" ] -\ No newline at end of file -+ENTRYPOINT ["bash", "start.sh"] -\ No newline at end of file -diff --git a/frontend/.docker/docker-compose.yaml b/frontend/.docker/docker-compose.yaml -deleted file mode 100644 -index e20cd4a..0000000 ---- a/frontend/.docker/docker-compose.yaml -+++ /dev/null -@@ -1,33 +0,0 @@ --version: "3" --services: -- viewer_app: -- tty: true -- stdin_open: true -- environment: -- - STAGE=dev -- build: -- context: ../ -- dockerfile: .docker/Dockerfile -- volumes: -- - ../:/usr/src/app -- ports: -- - "80:3000" -- networks: -- parser: -- entrypoint: -- - "yarn" -- - "start" -- nginx: -- image: nginx -- ports: -- - 80:80 -- - 443:443 -- networks: -- parser: -- volumes: -- - /etc/letsencrypt:/etc/letsencrypt -- - ./nginx/:/etc/nginx/sites-enabled/ --networks: -- parser: -- external: -- name: docker_parser -\ No newline at end of file From 2d2bcf64c5f6d86cb0a69d420c1ef7f590be65bc Mon Sep 17 00:00:00 2001 From: Brooks Ryba Date: Thu, 21 Nov 2019 19:07:09 -0500 Subject: [PATCH 3/3] fix postgres storage --- .docker/docker-compose.yml | 6 ++++-- .gitignore | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 21d14c1b..76030b91 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -59,10 +59,12 @@ services: POSTGRES_USER: parser POSTGRES_DB: us_code volumes: - - ../volumes/postgres:/var/lib/postgresql/data + - postgres-volume:/var/lib/postgresql/data networks: parser: networks: parser: external: - name: docker_parser \ No newline at end of file + name: docker_parser +volumes: + postgres-volume: \ No newline at end of file diff --git a/.gitignore b/.gitignore index 315c97c7..8ae0f18b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ **.pyc -**/node_modules -volumes/ \ No newline at end of file +**/node_modules \ No newline at end of file