diff --git a/.env.directory b/.env similarity index 100% rename from .env.directory rename to .env diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose.directory.migrations.tests.yml index 370149e50..a0e7769c8 100644 --- a/docker-compose.directory.migrations.tests.yml +++ b/docker-compose.directory.migrations.tests.yml @@ -9,9 +9,9 @@ services: volumes: - directory-migrations-tests-results:/app/tests/FilterLists.Infrastructure.Migrations.Tests/TestResults depends_on: - - directory-migrations-tests-db + - directory-db - directory-migrations-tests-db: + directory-db: image: postgres:alpine environment: POSTGRES_USER: ${DIRECTORY_DB_USER} diff --git a/services/directory/azure-pipelines.migrate.yaml b/services/directory/azure-pipelines.migrate.yaml index 7a1a5b6df..8d77f17dd 100644 --- a/services/directory/azure-pipelines.migrate.yaml +++ b/services/directory/azure-pipelines.migrate.yaml @@ -164,7 +164,7 @@ steps: condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), eq(variables['commitOrAbandon.committed'], 'true'), succeeded()) inputs: dockerComposeFile: docker-compose.directory.migrations.tests.yml - dockerComposeCommand: up -d directory-migrations-tests-db + dockerComposeCommand: up -d directory-db - task: DockerCompose@0 displayName: run test-migrations diff --git a/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs b/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs index b1d47e3bc..2b32e590b 100644 --- a/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs +++ b/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs @@ -16,7 +16,7 @@ public async Task Migrate_DoesNotThrowException() // allow time for db to init Thread.Sleep(20000); - const string connString = "Server=directory-migrations-tests-db;Database=filterlists;Uid=filterlists;Pwd=filterlists;"; + const string connString = "Server=directory-db;Database=filterlists;Uid=filterlists;Pwd=filterlists;"; var options = new DbContextOptionsBuilder() .UseNpgsql(connString, m => m.MigrationsAssembly("FilterLists.Directory.Infrastructure.Migrations")) .EnableSensitiveDataLogging()