From dedfc35cc87e7919fbc9c30ea85161d08c669ac0 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Fri, 10 Oct 2025 18:47:53 -0400 Subject: Remove need for docker network creation --- .env.mssql | 2 +- .env.mysql | 2 +- .env.postgresql | 2 +- docker-compose.mssql.yml | 3 +-- docker-compose.mysql.yml | 9 +-------- docker-compose.postgresql.yml | 9 +-------- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.env.mssql b/.env.mssql index ddf5add..a479ed1 100644 --- a/.env.mssql +++ b/.env.mssql @@ -1,3 +1,3 @@ -BOLT_DB_DSN=sqlserver://sa:TestPass123%21@localhost:4003?database=master +BOLT_DB_DSN=sqlserver://sa:TestPass123%21@localhost:1433?database=master BOLT_DB_DRIVER=mssql BOLT_DB_MIGRATIONS_TABLE=bolt_migrations diff --git a/.env.mysql b/.env.mysql index ce0377f..44782d6 100644 --- a/.env.mysql +++ b/.env.mysql @@ -1,3 +1,3 @@ -BOLT_DB_DSN='test_user:testpassword@tcp(localhost:4002)/test_db?parseTime=true' +BOLT_DB_DSN='test_user:testpassword@tcp(localhost:3306)/test_db?parseTime=true' BOLT_DB_DRIVER=mysql BOLT_DB_MIGRATIONS_TABLE=bolt_migrations diff --git a/.env.postgresql b/.env.postgresql index 3e3ad0b..aba5b61 100644 --- a/.env.postgresql +++ b/.env.postgresql @@ -1,3 +1,3 @@ -BOLT_DB_DSN=postgresql://test_user:testpassword@localhost:4001/test_db?sslmode=disable +BOLT_DB_DSN=postgresql://test_user:testpassword@localhost:5432/test_db?sslmode=disable BOLT_DB_DRIVER=postgresql BOLT_DB_MIGRATIONS_TABLE=bolt_migrations \ No newline at end of file diff --git a/docker-compose.mssql.yml b/docker-compose.mssql.yml index b3362bb..639cffd 100644 --- a/docker-compose.mssql.yml +++ b/docker-compose.mssql.yml @@ -2,6 +2,7 @@ services: mssql_db: image: mcr.microsoft.com/mssql/server:2022-latest container_name: bolt_mssql_db + network_mode: host healthcheck: test: [ @@ -12,8 +13,6 @@ services: timeout: 3s start_period: 10s retries: 10 - ports: - - "4003:1433" environment: - ACCEPT_EULA=Y - MSSQL_SA_PASSWORD=TestPass123! diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index cfa9b30..443960c 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -2,21 +2,14 @@ services: mysql_db: image: mysql:8.3 container_name: bolt_mysql_db + network_mode: host healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] interval: 10s timeout: 5s retries: 5 - ports: - - "4002:3306" environment: - MYSQL_DATABASE=test_db - MYSQL_USER=test_user - MYSQL_PASSWORD=testpassword - MYSQL_ROOT_PASSWORD=testpassword - volumes: - - mysql_db_volume:/var/lib/mysql - -volumes: - mysql_db_volume: - name: mysql-db-volume diff --git a/docker-compose.postgresql.yml b/docker-compose.postgresql.yml index d511647..737eb3e 100644 --- a/docker-compose.postgresql.yml +++ b/docker-compose.postgresql.yml @@ -2,20 +2,13 @@ services: postgres_db: image: postgres:16.1-alpine3.19 container_name: bolt_postgresql_db + network_mode: host healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s timeout: 5s retries: 5 - ports: - - "4001:5432" environment: - POSTGRES_DB=test_db - POSTGRES_USER=test_user - POSTGRES_PASSWORD=testpassword - volumes: - - postgres_db_volume:/var/lib/postgresql/data - -volumes: - postgres_db_volume: - name: postgres-db-volume -- cgit v1.2.3