mirror of
https://github.com/taroved/pol
synced 2025-05-16 14:20:10 -07:00
fix and add dependencies and path
This commit is contained in:
parent
d3cf32ce5c
commit
63c060b8af
14
Dockerfile
14
Dockerfile
@ -1,10 +1,12 @@
|
|||||||
FROM ubuntu:bionic as builder
|
FROM ubuntu:bionic as builder
|
||||||
|
|
||||||
|
#SHELL ["/bin/bash", "-c"]
|
||||||
|
|
||||||
RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \
|
RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \
|
||||||
&& echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \
|
&& echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \
|
||||||
&& apt-get update \
|
&& 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 bash mysql-client 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 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 \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip python-setuptools nodejs node-gyp npm ruby nginx \
|
||||||
&& pip install --upgrade pip \
|
&& pip install --upgrade pip \
|
||||||
&& npm install -g less@2.7.1 \
|
&& 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
|
WORKDIR /app
|
||||||
ADD . .
|
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 \
|
RUN cp ./nginx/default.site-example /etc/nginx/sites-available/default \
|
||||||
&& cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py
|
&& cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py
|
||||||
|
@ -1,6 +1,22 @@
|
|||||||
version: "3"
|
version: "3"
|
||||||
|
|
||||||
services:
|
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:
|
politepol:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
@ -15,30 +31,43 @@ services:
|
|||||||
image: politepol:latest
|
image: politepol:latest
|
||||||
depends_on:
|
depends_on:
|
||||||
- 'dbpolitepol'
|
- '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
|
container_name: politepol
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- politepol-network
|
- politepol-networkk
|
||||||
ports:
|
ports:
|
||||||
- '8088:8088'
|
- '8088:8088'
|
||||||
|
|
||||||
dbpolitepol:
|
tor:
|
||||||
image: mysql:5.7
|
image: strm/tor
|
||||||
container_name: dbpolitepol
|
container_name: politepoltor
|
||||||
restart: unless-stopped
|
restart: always
|
||||||
environment:
|
depends_on:
|
||||||
MYSQL_DATABASE: 'politepol'
|
- politepol
|
||||||
MYSQL_USER: 'rooooooooooot'
|
|
||||||
MYSQL_PASSWORD: 'toooooooooooor'
|
|
||||||
MYSQL_ROOT_PASSWORD: 'rootpass'
|
|
||||||
networks:
|
networks:
|
||||||
- politepol-network
|
- politepol-networkk
|
||||||
ports:
|
environment:
|
||||||
- '3306:3306'
|
LISTEN_PORT: "8088"
|
||||||
volumes:
|
REDIRECT: "politepol:8088"
|
||||||
- ./mysql:/var/lib/mysql
|
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:
|
networks:
|
||||||
politepol-network:
|
politepol-networkk:
|
||||||
driver: 'bridge'
|
driver: 'bridge'
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py
|
||||||
|
|
||||||
sed -i -E -e "s/(DEBUG = ).*/\1True/" \
|
sed -i -E -e "s/(DEBUG = ).*/\1True/" \
|
||||||
-e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \
|
-e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \
|
||||||
-e "s/('USER': ')root(',)/\1${DB_USER}\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 \
|
-e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \
|
||||||
&& service nginx reload
|
&& service nginx reload
|
||||||
|
|
||||||
service nginx start > /dev/null
|
echo hello; sleep 500000
|
||||||
|
|
||||||
/usr/bin/python ./frontend/manage.py migrate
|
#service nginx start > /dev/null
|
||||||
/usr/bin/python ./frontend/manage.py loaddata fields.json
|
|
||||||
|
|
||||||
/usr/bin/python ./downloader.py &
|
#/usr/bin/python ./frontend/manage.py migrate
|
||||||
/usr/bin/python ./frontend/manage.py runserver
|
#/usr/bin/python ./frontend/manage.py loaddata fields.json
|
||||||
|
|
||||||
|
#/usr/bin/python ./downloader.py &
|
||||||
|
#/usr/bin/python ./frontend/manage.py runserver
|
||||||
|
@ -3,7 +3,8 @@ Django==1.8.6
|
|||||||
lxml==3.8.0
|
lxml==3.8.0
|
||||||
Scrapy==1.4.0
|
Scrapy==1.4.0
|
||||||
django-pipeline==1.5.4
|
django-pipeline==1.5.4
|
||||||
mysqlclient==1.3.7
|
#mysqlclient==1.3.7
|
||||||
|
#MySQL-python==1.2.5
|
||||||
w3lib==1.17.0
|
w3lib==1.17.0
|
||||||
feedgenerator==1.8
|
feedgenerator==1.8
|
||||||
brotli==0.6.0
|
brotli==0.6.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user