diff options
| -rwxr-xr-x | Dockerfile | 4 | ||||
| -rwxr-xr-x | docker-compose.yml | 24 | ||||
| -rw-r--r-- | entrypoint.sh | 2 |
3 files changed, 24 insertions, 6 deletions
@@ -3,12 +3,10 @@ MAINTAINER Eden Attenborough "eden.attenborough@outlook.com" ENV TZ=Europe/London RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update -y -RUN apt-get install -y python3-pip python3-dev build-essential clang libffi-dev libxml2-dev libxslt-dev libjpeg-dev zlib1g-dev tmux cron +RUN apt-get install -y python3-pip python3-dev build-essential clang libffi-dev libxml2-dev libxslt-dev libjpeg-dev zlib1g-dev COPY . /app WORKDIR /app RUN pip3 install -r requirements.txt -RUN echo "*/30 * * * * root python3 /app/edaweb/cache.py > /proc/1/fd/1 2>/proc/1/fd/2" > /etc/crontab - ENTRYPOINT ["bash"] CMD ["entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index ecfa9f9..57cd71e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: edaweb: build: @@ -9,7 +8,7 @@ services: - /tmp/:/media/ISOs/ - ./edaweb/static/:/app/edaweb/static/ - ./edaweb.conf:/app/edaweb.conf - - ./edaweb-docker.pem:/keys/docker-key.pem + - edaweb-tmp:/tmp/ ports: - "6969:6969" networks: @@ -19,6 +18,24 @@ services: - mariadb:mysql restart: unless-stopped + edaweb_cron: + build: + context: . + dockerfile: Dockerfile_cron + image: reg.reaweb.uk/edaweb_cron + volumes: + - /tmp/:/media/ISOs/ + - ./edaweb/static/:/app/edaweb/static/ + - ./edaweb.conf:/app/edaweb.conf + - ./edaweb-docker.pem:/keys/docker-key.pem + - edaweb-tmp:/tmp/ + networks: + - db-network + - edaweb-net + external_links: + - mariadb:mysql + restart: unless-stopped + homelab-wiki: build: context: ./homelab-wiki @@ -38,6 +55,9 @@ services: - mariadb:mysql restart: unless-stopped +volumes: + edaweb-tmp: + networks: edaweb-net: external: diff --git a/entrypoint.sh b/entrypoint.sh index 70d7b26..f8664f0 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ rm -rvf /app/edaweb/edaweb.conf/ ln -s /app/edaweb.conf /app/edaweb/edaweb.conf printenv | grep -v "no_proxy" >> /etc/environment -tmux new-session -d -s "cron" 'cron -f || bash && bash'; +#tmux new-session -d -s "cron" 'cron -f || bash && bash'; python3 /app/edaweb/app.py --production |