From e3d601598e735407070dd50e09ab6e0c68ab32ae Mon Sep 17 00:00:00 2001
From: Bram <bramceulemans@me.com>
Date: Wed, 12 Jan 2022 04:16:17 +0100
Subject: [PATCH] Add separator between volume names (#312)

* Clean up volume names and MYSQL_ROOT_HOST to mariadb container

* Fix formatting
---
 src/Console/InstallCommand.php | 2 +-
 stubs/mariadb.stub             | 3 ++-
 stubs/meilisearch.stub         | 2 +-
 stubs/minio.stub               | 2 +-
 stubs/mysql.stub               | 2 +-
 stubs/pgsql.stub               | 2 +-
 stubs/redis.stub               | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
index 47e58a09..7aba5216 100644
--- a/src/Console/InstallCommand.php
+++ b/src/Console/InstallCommand.php
@@ -92,7 +92,7 @@ protected function buildDockerCompose(array $services)
             ->filter(function ($service) {
                 return in_array($service, ['mysql', 'pgsql', 'mariadb', 'redis', 'meilisearch', 'minio']);
             })->map(function ($service) {
-                return "    sail{$service}:\n        driver: local";
+                return "    sail-{$service}:\n        driver: local";
             })->whenNotEmpty(function ($collection) {
                 return $collection->prepend('volumes:');
             })->implode("\n");
diff --git a/stubs/mariadb.stub b/stubs/mariadb.stub
index 03820983..ec5aa3d0 100644
--- a/stubs/mariadb.stub
+++ b/stubs/mariadb.stub
@@ -4,12 +4,13 @@
             - '${FORWARD_DB_PORT:-3306}:3306'
         environment:
             MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
+            MYSQL_ROOT_HOST: "%"
             MYSQL_DATABASE: '${DB_DATABASE}'
             MYSQL_USER: '${DB_USERNAME}'
             MYSQL_PASSWORD: '${DB_PASSWORD}'
             MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
         volumes:
-            - 'sailmariadb:/var/lib/mysql'
+            - 'sail-mariadb:/var/lib/mysql'
         networks:
             - sail
         healthcheck:
diff --git a/stubs/meilisearch.stub b/stubs/meilisearch.stub
index 72834180..ced14f39 100644
--- a/stubs/meilisearch.stub
+++ b/stubs/meilisearch.stub
@@ -4,7 +4,7 @@
         ports:
             - '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
         volumes:
-            - 'sailmeilisearch:/data.ms'
+            - 'sail-meilisearch:/data.ms'
         networks:
             - sail
         healthcheck:
diff --git a/stubs/minio.stub b/stubs/minio.stub
index 30262785..1a4dc03d 100644
--- a/stubs/minio.stub
+++ b/stubs/minio.stub
@@ -7,7 +7,7 @@
             MINIO_ROOT_USER: 'sail'
             MINIO_ROOT_PASSWORD: 'password'
         volumes:
-            - 'sailminio:/data/minio'
+            - 'sail-minio:/data/minio'
         networks:
             - sail
         command: minio server /data/minio --console-address ":8900"
diff --git a/stubs/mysql.stub b/stubs/mysql.stub
index 91db03c8..2e70d8c9 100644
--- a/stubs/mysql.stub
+++ b/stubs/mysql.stub
@@ -10,7 +10,7 @@
             MYSQL_PASSWORD: '${DB_PASSWORD}'
             MYSQL_ALLOW_EMPTY_PASSWORD: 1
         volumes:
-            - 'sailmysql:/var/lib/mysql'
+            - 'sail-mysql:/var/lib/mysql'
         networks:
             - sail
         healthcheck:
diff --git a/stubs/pgsql.stub b/stubs/pgsql.stub
index d4609619..4d80895c 100644
--- a/stubs/pgsql.stub
+++ b/stubs/pgsql.stub
@@ -8,7 +8,7 @@
             POSTGRES_USER: '${DB_USERNAME}'
             POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
         volumes:
-            - 'sailpgsql:/var/lib/postgresql/data'
+            - 'sail-pgsql:/var/lib/postgresql/data'
         networks:
             - sail
         healthcheck:
diff --git a/stubs/redis.stub b/stubs/redis.stub
index e9e003e8..8bb88a1a 100644
--- a/stubs/redis.stub
+++ b/stubs/redis.stub
@@ -3,7 +3,7 @@
         ports:
             - '${FORWARD_REDIS_PORT:-6379}:6379'
         volumes:
-            - 'sailredis:/data'
+            - 'sail-redis:/data'
         networks:
             - sail
         healthcheck: