From 3f5438598958987a1d2bdad4c003022977d6d3fb Mon Sep 17 00:00:00 2001 From: Abdullah Adeel Date: Mon, 10 Jan 2022 05:02:44 +0500 Subject: [PATCH] update database docker files to extract db versions --- hooks/post_gen_project.py | 2 +- .../compose/production/mysql/Dockerfile | 2 +- .../compose/production/postgres/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 98d649627..e57430adc 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -229,7 +229,7 @@ def set_database_user(file_path: str, value: str, database_engine: str): return database_user -def set_database_password(file_path: str, database_engine: str, value: str | None=None): +def set_database_password(file_path: str, database_engine: str, value: str=None): database_password = set_flag( file_path, f"!!!SET {database_engine.upper()}_USER!!!", diff --git a/{{cookiecutter.project_slug}}/compose/production/mysql/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/mysql/Dockerfile index 40e52fa1c..71eabc804 100644 --- a/{{cookiecutter.project_slug}}/compose/production/mysql/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:{{ cookiecutter.database_version.lower()|split('@')[1] }} +FROM mysql:{{ cookiecutter.database_version.lower().split('@')[1] }} COPY ./compose/production/mysql/maintenance /usr/local/bin/maintenance RUN chmod +x /usr/local/bin/maintenance/* diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile index 301e68a1d..fa9f2ac80 100644 --- a/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:{{ cookiecutter.database_version.lower()|split('@')[1] }} +FROM postgres:{{ cookiecutter.database_version.lower().split('@')[1] }} COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance RUN chmod +x /usr/local/bin/maintenance/*