Skip to content

Commit 7656065

Browse files
committed
Ensure that environment variables should always be strings, not booleans.
This specifically is affecting the mysql and mariadb ALLOW_EMPTY_PASSWORD flag. It seems VSCode is doing something to handle coercing these to strings, but an issue occurs when using docker-compose on this file.
1 parent 7d17add commit 7656065

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

railties/lib/rails/generators/devcontainer.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def mysql_service
111111
"image" => "mysql/mysql-server:8.0",
112112
"restart" => "unless-stopped",
113113
"environment" => {
114-
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
114+
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
115115
"MYSQL_ROOT_HOST" => "%"
116116
},
117117
"volumes" => ["mysql-data:/var/lib/mysql"],
@@ -128,7 +128,7 @@ def mariadb_service
128128
"networks" => ["default"],
129129
"volumes" => ["mariadb-data:/var/lib/mysql"],
130130
"environment" => {
131-
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
131+
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
132132
},
133133
}
134134
}

railties/test/generators/app_generator_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ def test_devonctainer_mysql
13381338
"image" => "mysql/mysql-server:8.0",
13391339
"restart" => "unless-stopped",
13401340
"environment" => {
1341-
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
1341+
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
13421342
"MYSQL_ROOT_HOST" => "%"
13431343
},
13441344
"volumes" => ["mysql-data:/var/lib/mysql"],
@@ -1370,7 +1370,7 @@ def test_devonctainer_mariadb
13701370
"networks" => ["default"],
13711371
"volumes" => ["mariadb-data:/var/lib/mysql"],
13721372
"environment" => {
1373-
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
1373+
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
13741374
},
13751375
}
13761376

railties/test/generators/db_system_change_generator_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
104104
"image" => "mysql/mysql-server:8.0",
105105
"restart" => "unless-stopped",
106106
"environment" => {
107-
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
107+
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
108108
"MYSQL_ROOT_HOST" => "%"
109109
},
110110
"volumes" => ["mysql-data:/var/lib/mysql"],
@@ -171,7 +171,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
171171
"networks" => ["default"],
172172
"volumes" => ["mariadb-data:/var/lib/mysql"],
173173
"environment" => {
174-
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
174+
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
175175
},
176176
}
177177

0 commit comments

Comments
 (0)