diff --git a/Infrastructure/Infrastructure/Hushian.Infrastructure.csproj b/Infrastructure/Infrastructure/Hushian.Infrastructure.csproj index fe6fb8d..402af4b 100644 --- a/Infrastructure/Infrastructure/Hushian.Infrastructure.csproj +++ b/Infrastructure/Infrastructure/Hushian.Infrastructure.csproj @@ -21,7 +21,7 @@ - + diff --git a/Presentation/AIAss/Docker Command.txt b/Presentation/AIAss/Docker Command.txt index 3b40853..c307eba 100644 --- a/Presentation/AIAss/Docker Command.txt +++ b/Presentation/AIAss/Docker Command.txt @@ -1,3 +1,3 @@  docker build -t ai_assistance:v1 . - docker run --name openai_assistance -d -p 5042:5010 [IMAGEID] \ No newline at end of file + docker run --name openai_assistance -d -p 5042:5010 ai_assistance:v1 \ No newline at end of file diff --git a/Presentation/Hushian.WebApi/DockerCommand.txt b/Presentation/Hushian.WebApi/DockerCommand.txt index 177f0d5..86bc8e3 100644 --- a/Presentation/Hushian.WebApi/DockerCommand.txt +++ b/Presentation/Hushian.WebApi/DockerCommand.txt @@ -1,3 +1,3 @@ E:\_hushian> docker build -f Presentation\Hushian.WebApi\Dockerfile -t hushianapi . -docker run --name hushian_api -d -p 8080:8080 [imageid] \ No newline at end of file +docker run --name hushian_api -d -p 8080:8080 hushianapi \ No newline at end of file diff --git a/Presentation/Hushian.WebApi/appsettings.json b/Presentation/Hushian.WebApi/appsettings.json index 5e9b5a3..3ce7a08 100644 --- a/Presentation/Hushian.WebApi/appsettings.json +++ b/Presentation/Hushian.WebApi/appsettings.json @@ -18,7 +18,7 @@ }, "aigrpcserver": { - "target": "localhost:5042" + "target": "192.168.1.12:5011" }, diff --git a/Presentation/HushianWebApp/wwwroot/appsettings.json b/Presentation/HushianWebApp/wwwroot/appsettings.json index 8e5effb..3dde63f 100644 --- a/Presentation/HushianWebApp/wwwroot/appsettings.json +++ b/Presentation/HushianWebApp/wwwroot/appsettings.json @@ -1,5 +1,5 @@ { - "BaseAddress": "http://localhost:5089/api/", + "BaseAddress": "http://192.168.1.12:1011/api/", "Logging": { "LogLevel": { "Default": "Information", diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2a911b2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,52 @@ +version: '3.9' + +services: + aiass: + build: + context: ./Presentation/AIAss + dockerfile: Dockerfile + image: aiass:latest + container_name: aiass + environment: + - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_URLS=http://+:5010 + ports: + - "5011:5010" + networks: + - hushainnet + - aiassnet + + webapi: + build: + context: . + dockerfile: Presentation/Hushian.WebApi/Dockerfile + image: hushian.webapi:latest + container_name: hushian-webapi + environment: + - ASPNETCORE_ENVIRONMENT=Production + ports: + - "1011:8080" + - "1012:8081" + networks: + - hushainnet + + webapp: + build: + context: . + dockerfile: Presentation/HushianWebApp/Dockerfile + image: hushian.webapp:latest + container_name: hushian-webapp + ports: + - "80:5165" + depends_on: + - webapi + networks: + - hushainnet + +networks: + hushainnet: + name: hushainnet + aiassnet: + name: aiassnet + +