Merge pull request #26359 from jhipster/fix/26319

Fix MySQL 8.4.0 so it starts in Docker
jhipster · Jun 5, 2024 · 8685144 · 8685144
2 parents b413eda + 1239edd
commit 8685144
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 24 deletions.
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/generators/docker/templates/docker/mysql.yml.ejs b/generators/docker/templates/docker/mysql.yml.ejs
@@ -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

diff --git a/generators/kubernetes-knative/__snapshots__/knative.spec.ts.snap b/generators/kubernetes-knative/__snapshots__/knative.spec.ts.snap
@@ -10586,6 +10586,7 @@ spec:
               value: msmysql
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -11598,6 +11599,7 @@ spec:
               value: jhgate
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -12351,6 +12353,7 @@ spec:
               value: jhgate
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -12573,6 +12576,7 @@ spec:
               value: msmysql
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -13297,6 +13301,7 @@ spec:
               value: jhgate
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -14066,6 +14071,7 @@ spec:
               value: jhgate
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -15176,6 +15182,7 @@ spec:
               value: msmysql
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -18834,6 +18841,7 @@ spec:
               value: msmysql
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -19560,6 +19568,7 @@ spec:
               value: msmysql
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports:
@@ -20292,6 +20301,7 @@ spec:
               value: jhgate
           args:
             - --lower_case_table_names=1
+            - --skip-mysqlx
             - --character_set_server=utf8mb4
             - --explicit_defaults_for_timestamp
           ports: