diff --git a/.devcontainer/configs/vscode/.vscode/settings.json b/.devcontainer/configs/vscode/.vscode/settings.json index c14a0a2ae87..b7d951cb766 100644 --- a/.devcontainer/configs/vscode/.vscode/settings.json +++ b/.devcontainer/configs/vscode/.vscode/settings.json @@ -1,8 +1,8 @@ { "ruby-spec-runner.rspecEnv": { - "DB": "postgres", + "DB": "mysql", "POSTGRES_CONNECTION_PREFIX": "postgres://postgres:supersecret@localhost:5432", - "MYSQL_CONNECTION_PREFIX": "mysql2://root:supersecret@localhost:3306" + "MYSQL_CONNECTION_PREFIX": "mysql2://root:supersecret@127.0.0.1:3306" }, "ruby.rubocop.autocorrectOnSave": true, "ruby.rubocop.configFilePath": ".rubocop.yml", diff --git a/.devcontainer/docker-compose.override.yml b/.devcontainer/docker-compose.override.yml index a9d2ab587a9..ad5d2d5872e 100644 --- a/.devcontainer/docker-compose.override.yml +++ b/.devcontainer/docker-compose.override.yml @@ -1,4 +1,3 @@ -version: "3.3" services: # Dev Container diff --git a/.devcontainer/images/devcontainer/setup.sh b/.devcontainer/images/devcontainer/setup.sh index 64ac33c39ba..3f501f258de 100755 --- a/.devcontainer/images/devcontainer/setup.sh +++ b/.devcontainer/images/devcontainer/setup.sh @@ -55,5 +55,7 @@ setupYqCli # Setup User Permissions sudo groupadd docker sudo usermod -aG docker "vscode" +sudo chmod 777 /tmp +sudo chmod +t /tmp -trap "" EXIT \ No newline at end of file +trap "" EXIT diff --git a/.devcontainer/scripts/codespaces_init.sh b/.devcontainer/scripts/codespaces_init.sh index c9aa8f38683..8644a349caf 100755 --- a/.devcontainer/scripts/codespaces_init.sh +++ b/.devcontainer/scripts/codespaces_init.sh @@ -8,7 +8,7 @@ trap "pkill -P $$" EXIT mkdir -p tmp # Speed up docker builds by prebuilding with buildx -docker-compose pull || tee tmp/fail & +docker compose pull || tee tmp/fail & docker buildx bake -f docker-compose.yml -f .devcontainer/docker-compose.override.yml || tee tmp/fail & wait $(jobs -p) diff --git a/devenv.sh b/devenv.sh index c9ea501bcb5..314ef02542d 100755 --- a/devenv.sh +++ b/devenv.sh @@ -18,27 +18,27 @@ help_command() { # Create a clean development environment create_command(){ - docker-compose -p "" down + docker compose -p "" down docker buildx bake -f docker-compose.yml & - docker-compose -p "" pull & + docker compose -p "" pull & wait $(jobs -p) - docker-compose -p "" up -d --build + docker compose -p "" up -d --build ./.devcontainer/scripts/setupDevelopmentEnvironment.sh } # Start containers start_command(){ - docker-compose -p "" start + docker compose -p "" start } # Stop containers stop_command(){ - docker-compose -p "" stop + docker compose -p "" stop } # Remove containers destroy_command(){ - docker-compose -p "" down + docker compose -p "" down } # Call Setup IDEs Script @@ -72,7 +72,7 @@ fi # Check Prerequisites export should_exit=0 # Check Path Exists -for p in docker docker-compose ruby bundle mysql psql yq; do +for p in docker ruby bundle mysql psql yq; do if ! command -v "${p}" >/dev/null 2>&1; then echo "Error: Dependency \"$p\" is not installed" && export should_exit=1 fi diff --git a/docker-compose.yml b/docker-compose.yml index 3e13466f356..4f2b40a4e95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.3" services: # Postgres diff --git a/spec/support/bootstrap/db_config.rb b/spec/support/bootstrap/db_config.rb index 49bd018f4b4..1e451cddf99 100644 --- a/spec/support/bootstrap/db_config.rb +++ b/spec/support/bootstrap/db_config.rb @@ -56,7 +56,7 @@ def default_connection_string(db_type) def default_connection_prefix(db_type) default_connection_prefixes = { - 'mysql' => ENV['MYSQL_CONNECTION_PREFIX'] || 'mysql2://root:password@localhost:3306', + 'mysql' => ENV['MYSQL_CONNECTION_PREFIX'] || 'mysql2://root:password@127.0.0.1:3306', 'postgres' => ENV['POSTGRES_CONNECTION_PREFIX'] || 'postgres://postgres@localhost:5432' }