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