forked from MDCPS/DamageAssessment_Backend
		
	merge with docker-branch
This commit is contained in:
		| @ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employe | ||||
| EndProject | ||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employees.Test", "DamageAssesment.Api.Employees.Test\DamageAssesment.Api.Employees.Test.csproj", "{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}" | ||||
| EndProject | ||||
| Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{BADDE601-D7A6-425C-A592-A7E365E26188}" | ||||
| Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{E305D5CD-E635-4268-9F74-D3FBE0DF16C8}" | ||||
| EndProject | ||||
| Global | ||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
| @ -95,10 +95,10 @@ Global | ||||
| 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{BADDE601-D7A6-425C-A592-A7E365E26188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{BADDE601-D7A6-425C-A592-A7E365E26188}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{BADDE601-D7A6-425C-A592-A7E365E26188}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{BADDE601-D7A6-425C-A592-A7E365E26188}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{E305D5CD-E635-4268-9F74-D3FBE0DF16C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{E305D5CD-E635-4268-9F74-D3FBE0DF16C8}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{E305D5CD-E635-4268-9F74-D3FBE0DF16C8}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{E305D5CD-E635-4268-9F74-D3FBE0DF16C8}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 	EndGlobalSection | ||||
| 	GlobalSection(SolutionProperties) = preSolution | ||||
| 		HideSolutionNode = FALSE | ||||
|  | ||||
| @ -3,14 +3,12 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectVersion>2.1</ProjectVersion> | ||||
|     <DockerTargetOS>Linux</DockerTargetOS> | ||||
|     <ProjectGuid>badde601-d7a6-425c-a592-a7e365e26188</ProjectGuid> | ||||
|     <ProjectGuid>e305d5cd-e635-4268-9f74-d3fbe0df16c8</ProjectGuid> | ||||
|     <DockerLaunchAction>LaunchBrowser</DockerLaunchAction> | ||||
|     <DockerServiceUrl>{Scheme}://localhost:{ServicePort}/swagger</DockerServiceUrl> | ||||
|     <DockerServiceName>damageassesment.api.answers</DockerServiceName> | ||||
|     <DockerServiceName>damageassesment.api.surveys</DockerServiceName> | ||||
|   </PropertyGroup> | ||||
|   <ItemGroup> | ||||
|     <None Include="default_Local.conf" /> | ||||
|     <None Include="default.conf" /> | ||||
|     <None Include="docker-compose.override.yml"> | ||||
|       <DependentUpon>docker-compose.yml</DependentUpon> | ||||
|     </None> | ||||
|  | ||||
| @ -1,41 +1,68 @@ | ||||
| version: '3.4' | ||||
|  | ||||
| services: | ||||
|   #nginx: | ||||
|   #  container_name: my-nginx | ||||
|   #  image: nginx:latest | ||||
|   #  restart: always | ||||
|   #  ports: | ||||
|   #    - "80:80" | ||||
|   #  volumes: | ||||
|   #    - ./default.conf:/etc/nginx/conf.d/default.conf | ||||
|  | ||||
|   damageassesment.api.answers: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|  | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.150 | ||||
|     ports: | ||||
|       - "6001:80" | ||||
|     | ||||
|  | ||||
|   damageassesment.api.attachments: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.151         | ||||
|     ports: | ||||
|       - "6002:80" | ||||
|     | ||||
|  | ||||
|   damageassesment.api.employees: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.152 | ||||
|     ports: | ||||
|       - "6003:80" | ||||
|     | ||||
|   damageassesment.api.locations: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.153 | ||||
|     ports: | ||||
|       - "6004:80" | ||||
|     | ||||
|   damageassesment.api.questions: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.154 | ||||
|     ports: | ||||
|       - "6005:80" | ||||
|     | ||||
|   damageassesment.api.survey: | ||||
|     environment: | ||||
|       - ASPNETCORE_ENVIRONMENT=Development | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.155 | ||||
|     ports: | ||||
|       - "6006:80" | ||||
|     | ||||
| @ -48,5 +75,8 @@ services: | ||||
|       - services__Employees=http://damageassesment.api.employees:80 | ||||
|       - services__Attachments=http://damageassesment.api.attachments:80 | ||||
|       - services__Surveys=http://damageassesment.api.survey:80 | ||||
|     networks: | ||||
|       nginx-network: | ||||
|         ipv4_address: 172.18.0.156 | ||||
|     ports: | ||||
|       - "6007:80" | ||||
|  | ||||
| @ -1,50 +1,8 @@ | ||||
| version: '3.4' | ||||
|  | ||||
| services: | ||||
|   damageassesment.api.answers: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapianswers | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Answers/Dockerfile | ||||
|  | ||||
|   damageassesment.api.attachments: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapiattachments | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Attachments/Dockerfile | ||||
|  | ||||
|  | ||||
|   damageassesment.api.employees: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapiemployees | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Employees/Dockerfile | ||||
|  | ||||
|  | ||||
|   damageassesment.api.locations: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapilocations | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Locations/Dockerfile | ||||
|  | ||||
|  | ||||
|   damageassesment.api.questions: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapiquestions | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Questions/Dockerfile | ||||
|  | ||||
|  | ||||
|   damageassesment.api.survey: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapisurvey | ||||
|   damageassesment.api.surveys: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapisurveys | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.Surveys/Dockerfile | ||||
|  | ||||
|  | ||||
|   damageassesment.api.surveyresponses: | ||||
|     image: ${DOCKER_REGISTRY-}damageassesmentapisurveyresponses | ||||
|     build: | ||||
|       context: . | ||||
|       dockerfile: DamageAssesment.Api.SurveyResponses/Dockerfile | ||||
|  | ||||
|  | ||||
| @ -10,7 +10,8 @@ | ||||
|         "damageassesment.api.locations": "StartDebugging", | ||||
|         "damageassesment.api.questions": "StartDebugging", | ||||
|         "damageassesment.api.survey": "StartDebugging", | ||||
|         "damageassesment.api.surveyresponses": "StartDebugging" | ||||
|         "damageassesment.api.surveyresponses": "StartDebugging", | ||||
|         "damageassesment.api.surveys": "StartDebugging" | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user