Skip to content

Commit a09097b

Browse files
authored
Feature: Allow passing in extra options to MYSQL executable (#805)
* Add MYSQL_EXTRA_OPTIONS environment variable for mysql service, using an empty string by default * Use new MYSQL_EXTRA_OPTIONS in sail shell script to pass in options whenever sail mysql gets executed * Remove :-"" from mysql.stub * fix typo
1 parent 3ee6855 commit a09097b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

bin/sail

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ elif [ "$1" == "mysql" ]; then
489489
ARGS+=(exec)
490490
[ ! -t 0 ] && ARGS+=(-T)
491491
ARGS+=(mysql bash -c)
492-
ARGS+=("MYSQL_PWD=\${MYSQL_PASSWORD} mysql -u \${MYSQL_USER} \${MYSQL_DATABASE}")
492+
ARGS+=("MYSQL_PWD=\${MYSQL_PASSWORD} mysql -u \${MYSQL_USER} \${MYSQL_DATABASE} \${MYSQL_EXTRA_OPTIONS}")
493493
else
494494
sail_is_not_running
495495
fi

stubs/mysql.stub

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ mysql:
99
MYSQL_USER: '${DB_USERNAME}'
1010
MYSQL_PASSWORD: '${DB_PASSWORD}'
1111
MYSQL_ALLOW_EMPTY_PASSWORD: 1
12+
MYSQL_EXTRA_OPTIONS: '${MYSQL_EXTRA_OPTIONS}'
1213
volumes:
1314
- 'sail-mysql:/var/lib/mysql'
1415
- './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'

0 commit comments

Comments
 (0)