Skip to content

Commit 5723f0c

Browse files
authored
Fixed pytest action for MYSQL. Bumped MYSQL and postgresql versions. (#122)
Signed-off-by: Pavel Kirilin <[email protected]>
1 parent f9fe7a1 commit 5723f0c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

fastapi_template/input_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ class Database(BaseModel):
5252
),
5353
DatabaseType.postgresql: Database(
5454
name=DatabaseType.postgresql.value,
55-
image="postgres:13.6-bullseye",
55+
image="postgres:13.8-bullseye",
5656
async_driver="postgresql+asyncpg",
5757
driver_short="postgres",
5858
driver="postgresql",
5959
port=5432,
6060
),
6161
DatabaseType.mysql: Database(
6262
name=DatabaseType.mysql.value,
63-
image="bitnami/mysql:8.0.28",
63+
image="bitnami/mysql:8.0.30",
6464
async_driver="mysql+aiomysql",
6565
driver_short="mysql",
6666
driver="mysql",

fastapi_template/template/{{cookiecutter.project_name}}/.github/workflows/tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ jobs:
6262
POSTGRES_DB: {{ cookiecutter.project_name }}
6363
{%- endif %}
6464
{%- if cookiecutter.db_info.name == "mysql" %}
65-
MYSQL_PASSWORD: {{ cookiecutter.project_name }}
66-
MYSQL_USER: {{ cookiecutter.project_name }}
67-
MYSQL_DATABASE: {{ cookiecutter.project_name }}
68-
ALLOW_EMPTY_PASSWORD: yes
65+
MYSQL_ROOT_PASSWORD: "{{ cookiecutter.project_name }}"
66+
MYSQL_ROOT_USER: "{{ cookiecutter.project_name }}"
67+
MYSQL_DATABASE: "{{ cookiecutter.project_name }}"
68+
MYSQL_AUTHENTICATION_PLUGIN: "mysql_native_password"
6969
{%- endif %}
7070
{%- if cookiecutter.db_info.name == "mysql" %}
7171
options: >-
7272
--health-cmd="mysqladmin ping -u root"
7373
--health-interval=15s
7474
--health-timeout=5s
75-
--health-retries=5
75+
--health-retries=6
7676
{%- endif %}
7777
{%- if cookiecutter.db_info.name == "postgresql" %}
7878
options: >-

0 commit comments

Comments
 (0)