diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 54ec3561c6..6a40c7dd56 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -79,7 +79,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-files", "docker-files", "{0BEA55D6-E0B8-40DD-A256-B34C4DD990A5}" ProjectSection(SolutionItems) = preProject docker\docker-compose.yml = docker\docker-compose.yml + docker\down.ps1 = docker\down.ps1 docker\haproxy.cfg = docker\haproxy.cfg + docker\up.ps1 = docker\up.ps1 EndProjectSection EndProject Global diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a1d98519fd..31ef19ed96 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,21 +1,13 @@ version: '2' services: - abpdesk_web_1: + abpdesk_web: image: abpdesk/web environment: - ASPNETCORE_ENVIRONMENT=Staging - ports: - - "9001:80" - abpdesk_web_2: - image: abpdesk/web - environment: - - ASPNETCORE_ENVIRONMENT=Staging - ports: - - "9002:80" load_balancer: image: haproxy:1.7.1 volumes: - "./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg" ports: - - "9005:9005" \ No newline at end of file + - "9005:8080" \ No newline at end of file diff --git a/docker/down.ps1 b/docker/down.ps1 new file mode 100644 index 0000000000..508a7c4d74 --- /dev/null +++ b/docker/down.ps1 @@ -0,0 +1 @@ +docker-compose down -v --rmi local \ No newline at end of file diff --git a/docker/haproxy.cfg b/docker/haproxy.cfg index 43629caeb0..276ad980c8 100644 --- a/docker/haproxy.cfg +++ b/docker/haproxy.cfg @@ -8,10 +8,10 @@ defaults timeout server 50s listen http-in - bind *:9005 + bind *:8080 - server web-1 outputs_abpdesk_web_1_1:80 - server web-2 outputs_abpdesk_web_2_1:80 + server web-1 outputs_abpdesk_web_1:80 + server web-2 outputs_abpdesk_web_2:80 stats enable stats uri /haproxy diff --git a/docker/up.ps1 b/docker/up.ps1 new file mode 100644 index 0000000000..f1a7e701c2 --- /dev/null +++ b/docker/up.ps1 @@ -0,0 +1,6 @@ +docker rm $(docker ps -aq) +docker-compose up -d abpdesk_web +sleep 2 +docker-compose scale abpdesk_web=2 +sleep 2 +docker-compose up -d load_balancer \ No newline at end of file