5
0
mirror of https://github.com/cwinfo/yggdrasil-map synced 2024-11-23 12:51:36 +00:00

Changed Docker

This commit is contained in:
Christer Warén 2020-08-16 13:23:30 +03:00
parent 8a38b318fb
commit aae1136f15
3 changed files with 11 additions and 7 deletions

View File

@ -1,4 +1,4 @@
FROM debian:stretch
FROM debian:buster
LABEL maintainer="Christer Waren/CWINFO <christer.waren@cwinfo.org>"
ENV HOST localhost
@ -7,12 +7,13 @@ ENV PORT 3000
WORKDIR /src
RUN apt-get update && \
apt-get install -y git python-flask python-flup python-mysqldb python-pygraphviz python-networkx cron && \
apt-get install -y git wget python-flask python-flup python-mysqldb python-pygraphviz python-networkx cron && \
apt-get clean
RUN git clone https://github.com/Arceliar/yggdrasil-map.git yggdrasil-map
RUN git clone -b crawler https://github.com/Arceliar/yggdrasil-map.git yggdrasil-map
COPY web_config.cfg /src/yggdrasil-map/web/web_config.cfg
#COPY updateGraph.py /src/yggdrasil-map/web/updateGraph.py
COPY entrypoint.sh /usr/bin/entrypoint.sh
RUN chmod 0555 /usr/bin/entrypoint.sh
@ -20,4 +21,4 @@ RUN chmod 0555 /usr/bin/entrypoint.sh
COPY crontab /etc/cron.d/jobs
RUN chmod 0644 /etc/cron.d/jobs
ENTRYPOINT [ "/usr/bin/entrypoint.sh"]
ENTRYPOINT [ "/usr/bin/entrypoint.sh"]

View File

@ -1 +1,2 @@
*/10 * * * * root cd /src/yggdrasil-map/web/ && python updateGraph.py
#*/10 * * * * root cd /src/yggdrasil-map/web/ && python updateGraph.py
*/10 * * * * root cd /src/yggdrasil-map/web/static/ && rm /src/yggdrasil-map/web/static/graph.json && wget http://[21f:dd73:7cdb:773b:a924:7ec0:800b:221e]/static/graph.json

View File

@ -3,6 +3,8 @@
set -e
cron
cd /src/yggdrasil-map/web/ && python updateGraph.py
#cd /src/yggdrasil-map/scripts/ && python crawl-dht.py
#cd /src/yggdrasil-map/web/ && python updateGraph.py
cd /src/yggdrasil-map/web/static/ && wget http://[21f:dd73:7cdb:773b:a924:7ec0:800b:221e]/static/graph.json
python /src/yggdrasil-map/web/web.py --host $HOST --port $PORT
exit $?
exit $?