|
|
|
@ -17,8 +17,8 @@ services:
|
|
|
|
master:
|
|
|
|
master:
|
|
|
|
<<: *kompass
|
|
|
|
<<: *kompass
|
|
|
|
entrypoint: /app/docker/development/entrypoint-master.sh
|
|
|
|
entrypoint: /app/docker/development/entrypoint-master.sh
|
|
|
|
stdin_open: true # docker run -i
|
|
|
|
stdin_open: true
|
|
|
|
tty: true # docker run -t
|
|
|
|
tty: true
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- ./../../jdav_web:/app/jdav_web
|
|
|
|
- ./../../jdav_web:/app/jdav_web
|
|
|
|
ports:
|
|
|
|
ports:
|
|
|
|
@ -36,5 +36,5 @@ services:
|
|
|
|
restart: always
|
|
|
|
restart: always
|
|
|
|
image: mariadb
|
|
|
|
image: mariadb
|
|
|
|
volumes:
|
|
|
|
volumes:
|
|
|
|
- /tmp/db:/var/lib/mysql
|
|
|
|
- ./db:/var/lib/mysql
|
|
|
|
env_file: docker.env
|
|
|
|
env_file: docker.env
|
|
|
|
|