Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MySQL 8.4.0 so it starts in Docker #26359

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Fix MySQL 8.4.0 so it starts in Docker #26359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac3f657
Fix MySQL 8.4.0 so it starts in Docker
mraible Jun 4, 2024
1239edd
Update snapshots
mraible Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -314,7 +314,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -567,7 +567,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -607,7 +607,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -950,7 +950,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -995,7 +995,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -1376,7 +1376,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -1416,7 +1416,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -1711,7 +1711,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -1751,7 +1751,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2036,7 +2036,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2076,7 +2076,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2228,7 +2228,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2268,7 +2268,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2445,7 +2445,7 @@ management:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2485,7 +2485,7 @@ management:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2726,7 +2726,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2766,7 +2766,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -2885,7 +2885,7 @@ Launch all your infrastructure by running: \`docker compose up -d\`.
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=samplemysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -3017,7 +3017,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -3151,7 +3151,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=jhgate
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down Expand Up @@ -3283,7 +3283,7 @@ jhipster:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=msmysql
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test:
- CMD
Expand Down
3 changes: 1 addition & 2 deletions generators/docker/templates/docker/mysql.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ services:
image: <%- dockerContainers.mysql %>
volumes:
- ./config/mysql:/etc/mysql/conf.d
# - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=<%= baseName.toLowerCase() %>
# If you want to expose these ports outside your dev PC,
# remove the "127.0.0.1:" prefix
ports:
- 127.0.0.1:3306:3306
command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
healthcheck:
test: ["CMD", "mysql", "-e", "SHOW DATABASES;"]
interval: 5s
Expand Down
10 changes: 10 additions & 0 deletions generators/kubernetes-knative/__snapshots__/knative.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10586,6 +10586,7 @@ spec:
value: msmysql
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -11598,6 +11599,7 @@ spec:
value: jhgate
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -12351,6 +12353,7 @@ spec:
value: jhgate
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -12573,6 +12576,7 @@ spec:
value: msmysql
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -13297,6 +13301,7 @@ spec:
value: jhgate
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -14066,6 +14071,7 @@ spec:
value: jhgate
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -15176,6 +15182,7 @@ spec:
value: msmysql
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -18834,6 +18841,7 @@ spec:
value: msmysql
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -19560,6 +19568,7 @@ spec:
value: msmysql
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down Expand Up @@ -20292,6 +20301,7 @@ spec:
value: jhgate
args:
- --lower_case_table_names=1
- --skip-mysqlx
- --character_set_server=utf8mb4
- --explicit_defaults_for_timestamp
ports:
Expand Down
Loading
Loading