diff --git a/Streetcode/Streetcode.WebApi/Streetcode.WebApi.csproj b/Streetcode/Streetcode.WebApi/Streetcode.WebApi.csproj index 47ddd5b..f47f9fb 100644 --- a/Streetcode/Streetcode.WebApi/Streetcode.WebApi.csproj +++ b/Streetcode/Streetcode.WebApi/Streetcode.WebApi.csproj @@ -1,6 +1,8 @@  + + net10.0 enable enable diff --git a/Streetcode/Streetcode.WebApi/appsettings.Local.json b/Streetcode/Streetcode.WebApi/appsettings.Local.json index 14b4447..036a9a3 100644 --- a/Streetcode/Streetcode.WebApi/appsettings.Local.json +++ b/Streetcode/Streetcode.WebApi/appsettings.Local.json @@ -3,7 +3,7 @@ "DefaultConnection": "Server=127.0.0.1;Database=StreetcodeDb;User Id=sa;Password=Admin@1234;MultipleActiveResultSets=true" }, "CORS": { - "AllowedOrigins": [ "http://localhost:3000" ], + "AllowedOrigins": [ "http://localhost:3000" ], "AllowedHeaders": [ "*" ], "AllowedMethods": [ "*" ], "PreflightMaxAge": 1 diff --git a/Streetcode/Streetcode.sln b/Streetcode/Streetcode.sln index 782ed70..dc62174 100644 --- a/Streetcode/Streetcode.sln +++ b/Streetcode/Streetcode.sln @@ -20,6 +20,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{95E863CE-C3B4-4DBC-8C15-957E63BA45B6}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + docker-compose.yml = docker-compose.yml EndProjectSection EndProject Global diff --git a/Streetcode/docker-compose.yml b/Streetcode/docker-compose.yml new file mode 100644 index 0000000..492bbf6 --- /dev/null +++ b/Streetcode/docker-compose.yml @@ -0,0 +1,25 @@ +version: '3.8' + +services: + db: + image: mcr.microsoft.com/mssql/server:2022-latest + container_name: streetcode-db + environment: + - ACCEPT_EULA=Y + - MSSQL_SA_PASSWORD=${DB_PASSWORD} # pass + ports: + - "1434:1433" + + webapi: + build: + context: .. + dockerfile: Dockerfile + container_name: streetcode-api + ports: + - "5000:80" + - "5001:443" + depends_on: + - db + environment: + - ASPNETCORE_ENVIRONMENT=Development + - ConnectionStrings__DefaultConnection=Server=db;Database=StreetcodeDb;User Id=sa;Password=${DB_PASSWORD};TrustServerCertificate=True;MultipleActiveResultSets=true \ No newline at end of file