Skip to content

Commit

Permalink
Ensure that environment variables should always be strings, not boole…
Browse files Browse the repository at this point in the history
…ans.

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.
  • Loading branch information
andrewn617 committed Apr 12, 2024
1 parent 7d17add commit 7656065
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions railties/lib/rails/generators/devcontainer.rb
Expand Up @@ -111,7 +111,7 @@ def mysql_service
"image" => "mysql/mysql-server:8.0",
"restart" => "unless-stopped",
"environment" => {
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
"MYSQL_ROOT_HOST" => "%"
},
"volumes" => ["mysql-data:/var/lib/mysql"],
Expand All @@ -128,7 +128,7 @@ def mariadb_service
"networks" => ["default"],
"volumes" => ["mariadb-data:/var/lib/mysql"],
"environment" => {
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions railties/test/generators/app_generator_test.rb
Expand Up @@ -1338,7 +1338,7 @@ def test_devonctainer_mysql
"image" => "mysql/mysql-server:8.0",
"restart" => "unless-stopped",
"environment" => {
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
"MYSQL_ROOT_HOST" => "%"
},
"volumes" => ["mysql-data:/var/lib/mysql"],
Expand Down Expand Up @@ -1370,7 +1370,7 @@ def test_devonctainer_mariadb
"networks" => ["default"],
"volumes" => ["mariadb-data:/var/lib/mysql"],
"environment" => {
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
},
}

Expand Down
4 changes: 2 additions & 2 deletions railties/test/generators/db_system_change_generator_test.rb
Expand Up @@ -104,7 +104,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
"image" => "mysql/mysql-server:8.0",
"restart" => "unless-stopped",
"environment" => {
"MYSQL_ALLOW_EMPTY_PASSWORD" => true,
"MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
"MYSQL_ROOT_HOST" => "%"
},
"volumes" => ["mysql-data:/var/lib/mysql"],
Expand Down Expand Up @@ -171,7 +171,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
"networks" => ["default"],
"volumes" => ["mariadb-data:/var/lib/mysql"],
"environment" => {
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
},
}

Expand Down

0 comments on commit 7656065

Please sign in to comment.