diff --git a/.run/Compose Deployment.run.xml b/.run/Compose Deployment.run.xml index 6dc01ae..afd9dce 100644 --- a/.run/Compose Deployment.run.xml +++ b/.run/Compose Deployment.run.xml @@ -15,7 +15,6 @@ diff --git a/Lactose/Program.cs b/Lactose/Program.cs index 25ae36d..fef79bf 100644 --- a/Lactose/Program.cs +++ b/Lactose/Program.cs @@ -24,7 +24,7 @@ if (builder.Configuration.Get()!.Key.Length<32) { } -string? dbConnString = builder.Configuration.GetConnectionString("DefaultConnection"); +string? dbConnString = builder.Configuration.GetConnectionString("PostgresConnection"); builder.Services.AddDbContext( options => { diff --git a/Lactose/appsettings.Docker.json b/Lactose/appsettings.Docker.json index 7260453..9b9de43 100644 --- a/Lactose/appsettings.Docker.json +++ b/Lactose/appsettings.Docker.json @@ -7,6 +7,7 @@ } }, "ConnectionStrings": { - "DefaultConnection": "server=mariadb;port=3306;user=root;password=testOnlyDb;database=TestDb" + "DefaultConnection": "server=database;port=3306;user=root;password=testOnlyDb;database=TestDb", + "PostgresConnection": "Server=database;Port=3306;User Id=root;Password=testOnlyDb;Database=TestDb" } } \ No newline at end of file diff --git a/Lactose/appsettings.json b/Lactose/appsettings.json index 6b5e73f..3e1e01c 100644 --- a/Lactose/appsettings.json +++ b/Lactose/appsettings.json @@ -7,7 +7,8 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "server=localhost;port=3306;user=root;password=testOnlyDb;database=TestDb" + "DefaultConnection": "server=localhost;port=3306;user=root;password=testOnlyDb;database=TestDb", + "PostgresConnection": "Server=localhost;Port=3306;User Id=root;Password=testOnlyDb;Database=TestDb" }, "SignKey": { "Key": "32_CHARACTERS_KEY_IS_REQUIRED_TO_WORK" diff --git a/MilkyShots.sln.DotSettings.user b/MilkyShots.sln.DotSettings.user new file mode 100644 index 0000000..4eda9cd --- /dev/null +++ b/MilkyShots.sln.DotSettings.user @@ -0,0 +1,4 @@ + + ForceIncluded + ForceIncluded + ForceIncluded \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 61739d2..5c80bce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,23 +1,26 @@ -services: - lactose: - image: lactose - container_name: lactose - build: - context: . - dockerfile: Lactose/Dockerfile - ports: - - "5162:8080" - - mariadb: - image: mariadb - container_name: mariadb - environment: - MYSQL_ROOT_PASSWORD: testOnlyDb - MYSQL_DATABASE: testDb - volumes: - - "dbdata:/var/lib/mysql" - ports: - - "3306:3306" - -volumes: +services: + lactose: + image: lactose + container_name: lactose + build: + context: . + dockerfile: Lactose/Dockerfile + ports: + - "5162:8080" + depends_on: + - database + + database: + image: tensorchord/pgvecto-rs:pg17-v0.4.0 + container_name: database + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: testOnlyDb + POSTGRES_DB: testDb + volumes: + - "dbdata:/var/lib/postgresql" + ports: + - "3306:5432" + +volumes: dbdata: \ No newline at end of file