docker: make development database local folder and add wait for mysql logic

v1-0-stable
Christian Merten 3 years ago
parent b44beada98
commit acf0fafb00
Signed by: christian.merten
GPG Key ID: D953D69721B948B3

@ -113,3 +113,6 @@ config
# celerybeat schedule database # celerybeat schedule database
jdav_web/celerybeat-schedule.db jdav_web/celerybeat-schedule.db
# docker development database folder
docker/development/db

3
.gitignore vendored

@ -114,3 +114,6 @@ jdav_web/celerybeat-schedule.db
# docker environment variables # docker environment variables
docker.env docker.env
# docker development database folder
docker/development/db

@ -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

@ -2,7 +2,31 @@
set -o errexit set -o errexit
sleep 5 mysql_ready() {
cd /app/jdav_web
python << END
import sys
from django.db import connections
from django.db.utils import OperationalError
db_conn = connections['default']
try:
c = db_conn.cursor()
except OperationalError:
sys.exit(-1)
else:
sys.exit(0)
END
}
until mysql_ready; do
>&2 echo 'Waiting for MySQL to become available...'
sleep 1
done
>&2 echo 'MySQL is available'
cd /app cd /app

Loading…
Cancel
Save