diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.mysql b/{{cookiecutter.project_slug}}/.envs/.local/.mysql index caf619828..765b69183 100644 --- a/{{cookiecutter.project_slug}}/.envs/.local/.mysql +++ b/{{cookiecutter.project_slug}}/.envs/.local/.mysql @@ -2,7 +2,7 @@ # ------------------------------------------------------------------------------ MYSQL_HOST=mysql MYSQL_PORT=3306 -MYSQL_DB={{ cookiecutter.project_slug }} +MYSQL_DATABASE={{ cookiecutter.project_slug }} MYSQL_USER=!!!SET MYSQL_USER!!! MYSQL_PASSWORD=!!!SET MYSQL_PASSWORD!!! MYSQL_ROOT_PASSWORD=!!!SET MYSQL_ROOT_PASSWORD!!! diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.mysql b/{{cookiecutter.project_slug}}/.envs/.production/.mysql index bc7819451..221c8e264 100644 --- a/{{cookiecutter.project_slug}}/.envs/.production/.mysql +++ b/{{cookiecutter.project_slug}}/.envs/.production/.mysql @@ -2,7 +2,7 @@ # ------------------------------------------------------------------------------ MYSQL_HOST=mysql MYSQL_PORT=3306 -MYSQL_DB={{ cookiecutter.project_slug }} +MYSQL_DATABASE={{ cookiecutter.project_slug }} MYSQL_USER=!!!SET MYSQL_USER!!! MYSQL_PASSWORD=!!!SET MYSQL_PASSWORD!!! MYSQL_ROOT_PASSWORD=!!!SET MYSQL_ROOT_PASSWORD!!! diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint index db1c81edb..109fcfdcc 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint +++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint @@ -22,7 +22,7 @@ if [ -z "${MYSQL_USER}" ]; then base_mysql_image_default_user='mysql' export MYSQL_USER="${base_mysql_image_default_user}" fi -export DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}" +export DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}" {%- endif %} database_ready() { @@ -52,7 +52,7 @@ try: host="${MYSQL_HOST}", user="${MYSQL_USER}", password="${MYSQL_PASSWORD}", - database="${MYSQL_DB}", + database="${MYSQL_DATABASE}", port=int("${MYSQL_PORT}") ) except MySQLdb._exceptions.OperationalError: