From 820af6f9b31f07fa4e52647d1318a1d940704800 Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Tue, 17 Dec 2019 11:40:09 -0300 Subject: [PATCH 1/6] wait-for-it --- docker-compose.yaml | 4 +++- settings.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 120000 settings.py diff --git a/docker-compose.yaml b/docker-compose.yaml index 228029b..a8e91fd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,7 +15,7 @@ services: image: politepol:latest depends_on: - 'dbpolitepol' - command: ["./wait-for-it.sh", "db:3306", "--", "/bin/bash", "./frontend/start.sh"] + command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"] container_name: politepol restart: unless-stopped networks: @@ -34,6 +34,8 @@ services: MYSQL_ROOT_PASSWORD: 'rootpass' networks: - politepol-network + ports: + - '3306:3306' volumes: - ./mysql:/var/lib/mysql diff --git a/settings.py b/settings.py deleted file mode 120000 index 68ee22f..0000000 --- a/settings.py +++ /dev/null @@ -1 +0,0 @@ -./frontend/frontend/settings.py \ No newline at end of file From 63c060b8af887ed417405c4ac2d4990f302dd3a6 Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Fri, 31 Jan 2020 15:14:06 -0300 Subject: [PATCH 2/6] fix and add dependencies and path --- Dockerfile | 14 +++++++--- docker-compose.yaml | 65 ++++++++++++++++++++++++++++++++------------- frontend/start.sh | 14 ++++++---- requirements.txt | 3 ++- 4 files changed, 69 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb134f2..ef513a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ FROM ubuntu:bionic as builder +#SHELL ["/bin/bash", "-c"] + RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \ && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y bash vim.tiny wget sudo net-tools ca-certificates unzip apt-transport-https \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y bash mysql-client vim.tiny wget sudo net-tools ca-certificates unzip apt-transport-https \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext \ && DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip python-setuptools nodejs node-gyp npm ruby nginx \ && pip install --upgrade pip \ && npm install -g less@2.7.1 \ @@ -14,7 +16,13 @@ RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ WORKDIR /app ADD . . -RUN pip install -r requirements.txt +RUN export PATH=$PATH:/usr/bin/ \ + && export PATH=$PATH:/usr/local/bin/ + +RUN pip install --upgrade setuptools \ + && pip install -r requirements.txt \ + && apt-get install -y libmysqlclient-dev \ + && pip install --user MySQL-python RUN cp ./nginx/default.site-example /etc/nginx/sites-available/default \ && cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py diff --git a/docker-compose.yaml b/docker-compose.yaml index a8e91fd..ad70bbd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,22 @@ version: "3" services: + dbpolitepol: + image: mysql:5.7 + container_name: dbpolitepol + restart: unless-stopped + environment: + MYSQL_DATABASE: 'politepol' + MYSQL_USER: 'rooooooooooot' + MYSQL_PASSWORD: 'toooooooooooor' + MYSQL_ROOT_PASSWORD: 'rootpass' + networks: + - politepol-networkk + ports: + - '3306:3306' + volumes: + - ./mysql:/var/lib/mysql + politepol: build: context: . @@ -15,30 +31,43 @@ services: image: politepol:latest depends_on: - 'dbpolitepol' - command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"] + #command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"] + command: ["./wait-for-it.sh", "$$DB_HOST:$$DB_PORT", "--", "/bin/bash", "./frontend/start.sh"] container_name: politepol restart: unless-stopped networks: - - politepol-network + - politepol-networkk ports: - '8088:8088' - - dbpolitepol: - image: mysql:5.7 - container_name: dbpolitepol - restart: unless-stopped - environment: - MYSQL_DATABASE: 'politepol' - MYSQL_USER: 'rooooooooooot' - MYSQL_PASSWORD: 'toooooooooooor' - MYSQL_ROOT_PASSWORD: 'rootpass' + + tor: + image: strm/tor + container_name: politepoltor + restart: always + depends_on: + - politepol networks: - - politepol-network - ports: - - '3306:3306' - volumes: - - ./mysql:/var/lib/mysql + - politepol-networkk + environment: + LISTEN_PORT: "8088" + REDIRECT: "politepol:8088" + PRIVATE_KEY: | + -----BEGIN RSA PRIVATE KEY----- + MIICXAIBAAKBgQDg+QNdw6IRSMH/eI569HaUu5kuFkF/LdKZebuVN02SU8XcunTM + endXIHcrQpRp9qYUeX0ZOHnAiFU3rmss+tTPnjkM7CYZLxu/OYPHlR+LHYUZQmqS + AZepZI0iMF7i9wOtKobSAMJ1wod8bythvrH8m62JjAkEkYRGljIERn85/wIDAR7b + AoGABAoQB0X/SiGoq7744JoSJq2Zr2iOe+veoqbFpEucVGX9gYXZWSygvBo+41P9 + 0MprHxgJFmgJSJ5txdCcEzntfhRoFioccD10xr1EQ3GAgZg98zk+07FAJjoTyywH + eMB44ELuLWJCe0SKnhgSXHKTq3/PsN72G0siLn2OW+yt29cCQQD1d59FGYL712zi + H4C+N3T6SDG3wYBURNNq7xdrvdvCixFbAuSmxgan2ITFnbV/eClbJrbmOZgp2r+l + O5GA6inNAkEA6qBDz0eqW9btMQLbqdRvRHMIJ+YVomR876hZZ1UmyiFw4KGkbNo+ + wOKTD5BkrnsswnH+vfKPltm9r7wCiXM2+wJAVI/xpCaCzAz6AAMrVj8Ximk17hdk + HW9BiThD/nhGsXjXIvCr4ByMJW97ljvvgn8KfhGsckF818Kux47iwf202wJAP02I + UsctwtqS74zFnUN1xLCkc/JbQoPua8h9IklxLB2Y6Bfk9QgIJzSNIReB6pL9mFk3 + vbgIdfY9JQvOn9mh2QJBAJ3OQcJXAz9NzOS863KKIv4WHOvP3h8yJYgAb2CO8rpo + 6jBZfa9K1bDxpIRtX+TBOQqaZCVtb5IIhsgj0pwmNcw= + -----END RSA PRIVATE KEY----- networks: - politepol-network: + politepol-networkk: driver: 'bridge' diff --git a/frontend/start.sh b/frontend/start.sh index f164bae..980e3be 100644 --- a/frontend/start.sh +++ b/frontend/start.sh @@ -1,5 +1,7 @@ #!/bin/bash +cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py + sed -i -E -e "s/(DEBUG = ).*/\1True/" \ -e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \ -e "s/('USER': ')root(',)/\1${DB_USER}\2/" \ @@ -13,10 +15,12 @@ sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \ -e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \ && service nginx reload -service nginx start > /dev/null +echo hello; sleep 500000 -/usr/bin/python ./frontend/manage.py migrate -/usr/bin/python ./frontend/manage.py loaddata fields.json +#service nginx start > /dev/null -/usr/bin/python ./downloader.py & -/usr/bin/python ./frontend/manage.py runserver +#/usr/bin/python ./frontend/manage.py migrate +#/usr/bin/python ./frontend/manage.py loaddata fields.json + +#/usr/bin/python ./downloader.py & +#/usr/bin/python ./frontend/manage.py runserver diff --git a/requirements.txt b/requirements.txt index 0bcb975..34bc9e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,8 @@ Django==1.8.6 lxml==3.8.0 Scrapy==1.4.0 django-pipeline==1.5.4 -mysqlclient==1.3.7 +#mysqlclient==1.3.7 +#MySQL-python==1.2.5 w3lib==1.17.0 feedgenerator==1.8 brotli==0.6.0 From 4603342beac92623106ff71f82769040f834283f Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Fri, 31 Jan 2020 15:20:48 -0300 Subject: [PATCH 3/6] fix and add dependencies and path --- docker-compose.yaml | 65 +++++++++++---------------------------------- 1 file changed, 15 insertions(+), 50 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2c23288..3551200 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,22 +1,6 @@ version: "3" services: - dbpolitepol: - image: mysql:5.7 - container_name: dbpolitepol - restart: unless-stopped - environment: - MYSQL_DATABASE: 'politepol' - MYSQL_USER: 'rooooooooooot' - MYSQL_PASSWORD: 'toooooooooooor' - MYSQL_ROOT_PASSWORD: 'rootpass' - networks: - - politepol-networkk - ports: - - '3306:3306' - volumes: - - ./mysql:/var/lib/mysql - politepol: build: context: . @@ -31,48 +15,29 @@ services: image: politepol:latest depends_on: - 'dbpolitepol' -<<<<<<< HEAD - #command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"] - command: ["./wait-for-it.sh", "$$DB_HOST:$$DB_PORT", "--", "/bin/bash", "./frontend/start.sh"] -======= #command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"] command: ["./wait-for-it.sh", "dbpolitepol", "/bin/bash", "./frontend/start.sh"] ->>>>>>> e65602626da439ff0b34d0c9bbe06d5def5d1401 container_name: politepol restart: unless-stopped networks: - - politepol-networkk + - politepol-network ports: - '8088:8088' - - tor: - image: strm/tor - container_name: politepoltor - restart: always - depends_on: - - politepol - networks: - - politepol-networkk + + dbpolitepol: + image: mysql:5.7 + container_name: dbpolitepol + restart: unless-stopped environment: - LISTEN_PORT: "8088" - REDIRECT: "politepol:8088" - PRIVATE_KEY: | - -----BEGIN RSA PRIVATE KEY----- - MIICXAIBAAKBgQDg+QNdw6IRSMH/eI569HaUu5kuFkF/LdKZebuVN02SU8XcunTM - endXIHcrQpRp9qYUeX0ZOHnAiFU3rmss+tTPnjkM7CYZLxu/OYPHlR+LHYUZQmqS - AZepZI0iMF7i9wOtKobSAMJ1wod8bythvrH8m62JjAkEkYRGljIERn85/wIDAR7b - AoGABAoQB0X/SiGoq7744JoSJq2Zr2iOe+veoqbFpEucVGX9gYXZWSygvBo+41P9 - 0MprHxgJFmgJSJ5txdCcEzntfhRoFioccD10xr1EQ3GAgZg98zk+07FAJjoTyywH - eMB44ELuLWJCe0SKnhgSXHKTq3/PsN72G0siLn2OW+yt29cCQQD1d59FGYL712zi - H4C+N3T6SDG3wYBURNNq7xdrvdvCixFbAuSmxgan2ITFnbV/eClbJrbmOZgp2r+l - O5GA6inNAkEA6qBDz0eqW9btMQLbqdRvRHMIJ+YVomR876hZZ1UmyiFw4KGkbNo+ - wOKTD5BkrnsswnH+vfKPltm9r7wCiXM2+wJAVI/xpCaCzAz6AAMrVj8Ximk17hdk - HW9BiThD/nhGsXjXIvCr4ByMJW97ljvvgn8KfhGsckF818Kux47iwf202wJAP02I - UsctwtqS74zFnUN1xLCkc/JbQoPua8h9IklxLB2Y6Bfk9QgIJzSNIReB6pL9mFk3 - vbgIdfY9JQvOn9mh2QJBAJ3OQcJXAz9NzOS863KKIv4WHOvP3h8yJYgAb2CO8rpo - 6jBZfa9K1bDxpIRtX+TBOQqaZCVtb5IIhsgj0pwmNcw= - -----END RSA PRIVATE KEY----- + MYSQL_DATABASE: 'politepol' + MYSQL_USER: 'rooooooooooot' + MYSQL_PASSWORD: 'toooooooooooor' + MYSQL_ROOT_PASSWORD: 'rootpass' + networks: + - politepol-network + volumes: + - ./mysql:/var/lib/mysql networks: - politepol-networkk: + politepol-network: driver: 'bridge' From ce781e837d985ef811426837369e605a1b5efffd Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Fri, 31 Jan 2020 16:02:15 -0300 Subject: [PATCH 4/6] fix path --- frontend/start.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/frontend/start.sh b/frontend/start.sh index 980e3be..f164bae 100644 --- a/frontend/start.sh +++ b/frontend/start.sh @@ -1,7 +1,5 @@ #!/bin/bash -cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py - sed -i -E -e "s/(DEBUG = ).*/\1True/" \ -e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \ -e "s/('USER': ')root(',)/\1${DB_USER}\2/" \ @@ -15,12 +13,10 @@ sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \ -e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \ && service nginx reload -echo hello; sleep 500000 +service nginx start > /dev/null -#service nginx start > /dev/null +/usr/bin/python ./frontend/manage.py migrate +/usr/bin/python ./frontend/manage.py loaddata fields.json -#/usr/bin/python ./frontend/manage.py migrate -#/usr/bin/python ./frontend/manage.py loaddata fields.json - -#/usr/bin/python ./downloader.py & -#/usr/bin/python ./frontend/manage.py runserver +/usr/bin/python ./downloader.py & +/usr/bin/python ./frontend/manage.py runserver From 02b0822fc1210acdbfd587f9be176c98fc1d00b1 Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Fri, 31 Jan 2020 19:06:48 +0000 Subject: [PATCH 5/6] Create settings.py --- settings.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 settings.py diff --git a/settings.py b/settings.py new file mode 100644 index 0000000..b72a4c4 --- /dev/null +++ b/settings.py @@ -0,0 +1 @@ +./frontend/frontend/settings.py From 78c7f60e03774de0d62f88c4762eb3a1307ec469 Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Fri, 31 Jan 2020 16:10:46 -0300 Subject: [PATCH 6/6] fix path --- settings.py | 1 + 1 file changed, 1 insertion(+) create mode 120000 settings.py diff --git a/settings.py b/settings.py new file mode 120000 index 0000000..68ee22f --- /dev/null +++ b/settings.py @@ -0,0 +1 @@ +./frontend/frontend/settings.py \ No newline at end of file