aboutsummaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose.yml')
-rwxr-xr-xdocker-compose.yml43
1 files changed, 32 insertions, 11 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 67976bf..01bf365 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
services:
edaweb:
build:
@@ -8,13 +7,33 @@ services:
volumes:
- /tmp/:/media/ISOs/
- ./edaweb/static/:/app/edaweb/static/
- - ./edaweb.conf:/app/edaweb/edaweb.conf
- - ./edaweb-docker.pem:/keys/docker-key.pem
+ - ./edaweb.conf:/app/edaweb.conf
+ - edaweb-tmp:/tmp/
ports:
- "6969:6969"
+ external_links:
+ - mariadb:mysql
+ - transmission_1:transmission
+ mac_address: 44:c8:09:a7:d0:93
+ networks:
+ db-network:
+ rr-net:
+ ipv4_address: "192.168.23.13"
+ 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
@@ -33,17 +52,19 @@ services:
- "6970:80"
networks:
- db-network
- - edaweb-net
external_links:
- mariadb:mysql
restart: unless-stopped
-networks:
- edaweb-net:
- external:
- name: edaweb-net
+volumes:
+ edaweb-tmp:
+networks:
db-network:
- external:
- name: mariadb
+ external: true
+ name: mariadb
+
+ rr-net:
+ external: true
+ name: rr-net