Merge pull request #408 from kool-dev/change_mysql_to_apple_support

Moving to mysql/mysql-server for ARM / Apple M1 Support
kool-dev · Mar 26, 2022 · cf6e6cc · cf6e6cc
2 parents 29bb0e7 + 8b7460a
commit cf6e6cc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/templates/database/mysql57-adonis.yml b/templates/database/mysql57-adonis.yml
@@ -1,14 +1,15 @@
 services:
   database:
-    image: mysql:5.7
+    image: mysql/mysql-server:5.7
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USER-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:

diff --git a/templates/database/mysql57.yml b/templates/database/mysql57.yml
@@ -1,14 +1,15 @@
 services:
   database:
-    image: mysql:5.7
+    image: mysql/mysql-server:5.7
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USERNAME-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:

diff --git a/templates/database/mysql8-adonis.yml b/templates/database/mysql8-adonis.yml
@@ -1,15 +1,16 @@
 services:
   database:
-    image: mysql:8.0
+    image: mysql/mysql-server:8.0
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USER-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks:

diff --git a/templates/database/mysql8.yml b/templates/database/mysql8.yml
@@ -1,15 +1,16 @@
 services:
   database:
-    image: mysql:8.0
+    image: mysql/mysql-server:8.0
     command: --default-authentication-plugin=mysql_native_password
     ports:
       - "${KOOL_DATABASE_PORT:-3306}:3306"
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: "${DB_PASSWORD-rootpass}"
       MYSQL_DATABASE: "${DB_DATABASE-database}"
       MYSQL_USER: "${DB_USERNAME-user}"
       MYSQL_PASSWORD: "${DB_PASSWORD-pass}"
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - database:/var/lib/mysql:delegated
     networks: