Skip to content

Commit e3d6015

Browse files
author
Bram
authored
Add separator between volume names (laravel#312)
* Clean up volume names and MYSQL_ROOT_HOST to mariadb container * Fix formatting
1 parent 5365296 commit e3d6015

7 files changed

+8
-7
lines changed

src/Console/InstallCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function buildDockerCompose(array $services)
9292
->filter(function ($service) {
9393
return in_array($service, ['mysql', 'pgsql', 'mariadb', 'redis', 'meilisearch', 'minio']);
9494
})->map(function ($service) {
95-
return " sail{$service}:\n driver: local";
95+
return " sail-{$service}:\n driver: local";
9696
})->whenNotEmpty(function ($collection) {
9797
return $collection->prepend('volumes:');
9898
})->implode("\n");

stubs/mariadb.stub

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
- '${FORWARD_DB_PORT:-3306}:3306'
55
environment:
66
MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
7+
MYSQL_ROOT_HOST: "%"
78
MYSQL_DATABASE: '${DB_DATABASE}'
89
MYSQL_USER: '${DB_USERNAME}'
910
MYSQL_PASSWORD: '${DB_PASSWORD}'
1011
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
1112
volumes:
12-
- 'sailmariadb:/var/lib/mysql'
13+
- 'sail-mariadb:/var/lib/mysql'
1314
networks:
1415
- sail
1516
healthcheck:

stubs/meilisearch.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ports:
55
- '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
66
volumes:
7-
- 'sailmeilisearch:/data.ms'
7+
- 'sail-meilisearch:/data.ms'
88
networks:
99
- sail
1010
healthcheck:

stubs/minio.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
MINIO_ROOT_USER: 'sail'
88
MINIO_ROOT_PASSWORD: 'password'
99
volumes:
10-
- 'sailminio:/data/minio'
10+
- 'sail-minio:/data/minio'
1111
networks:
1212
- sail
1313
command: minio server /data/minio --console-address ":8900"

stubs/mysql.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
MYSQL_PASSWORD: '${DB_PASSWORD}'
1111
MYSQL_ALLOW_EMPTY_PASSWORD: 1
1212
volumes:
13-
- 'sailmysql:/var/lib/mysql'
13+
- 'sail-mysql:/var/lib/mysql'
1414
networks:
1515
- sail
1616
healthcheck:

stubs/pgsql.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
POSTGRES_USER: '${DB_USERNAME}'
99
POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
1010
volumes:
11-
- 'sailpgsql:/var/lib/postgresql/data'
11+
- 'sail-pgsql:/var/lib/postgresql/data'
1212
networks:
1313
- sail
1414
healthcheck:

stubs/redis.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ports:
44
- '${FORWARD_REDIS_PORT:-6379}:6379'
55
volumes:
6-
- 'sailredis:/data'
6+
- 'sail-redis:/data'
77
networks:
88
- sail
99
healthcheck:

0 commit comments

Comments
 (0)