From 8ce5bbfb4537bef71741d9ec0bedc0432952dc4e Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 19:51:42 -0300
Subject: [PATCH 01/19] Alterado para simular um balanceador de carga com 3
servidores
---
docker-compose.yaml | 41 +++++++++++++++++++++++++++++++++++------
nginx/conf.d/app.conf | 17 +++++++++++++++--
2 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5c9bdc4..10f9194 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,9 @@
version: '3'
+networks:
+ dbnet:
+ external:
+ name: dbnet
+
services:
nginx:
container_name: some-nginx
@@ -6,18 +11,42 @@ services:
restart: always
ports:
- 80:80
- - 443:443
+ links:
+ - app1:app1
+ - app2:app2
+ - app3:app3
volumes:
- ./nginx/conf.d:/etc/nginx/conf.d
- depends_on:
- - app
-
- app:
+ app1:
restart: always
build: ./app
working_dir: /app
volumes:
- ./app:/app
expose:
- - "8080"
+ - "8081"
+ networks:
+ - dbnet
command: mvn clean spring-boot:run
+ app2:
+ restart: always
+ build: ./app
+ working_dir: /app
+ volumes:
+ - ./app:/app
+ expose:
+ - "8082"
+ networks:
+ - dbnet
+ command: mvn clean spring-boot:run
+ app3:
+ restart: always
+ build: ./app
+ working_dir: /app
+ volumes:
+ - ./app:/app
+ expose:
+ - "8083"
+ networks:
+ - dbnet
+ command: mvn clean spring-boot:run
\ No newline at end of file
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 4860514..e7bebbb 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,11 +1,24 @@
+worker_processes auto;
+
+events { worker_connections 1024; }
+
+http {
+ upstream node-app {
+ least_conn;
+ server localhost:8081 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8082 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8083 weight=10 max_fails=3 fail_timeout=30s;
+ }
+
server {
listen 80;
charset utf-8;
access_log off;
location / {
- proxy_pass http://app:8080;
- proxy_set_header Host $host:$server_port;
+ proxy_pass http://app;
+ proxy_redirect off;
+ proxy_set_header Host $host;
proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
From 87f7f9cc7fffb5712d7490d5842f4690c150a00a Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:06:24 -0300
Subject: [PATCH 02/19] alterada a posicao de chamada do nginx
---
docker-compose.yaml | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 10f9194..41993c2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,18 +5,6 @@ networks:
name: dbnet
services:
- nginx:
- container_name: some-nginx
- image: nginx:1.13
- restart: always
- ports:
- - 80:80
- links:
- - app1:app1
- - app2:app2
- - app3:app3
- volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
app1:
restart: always
build: ./app
@@ -49,4 +37,17 @@ services:
- "8083"
networks:
- dbnet
- command: mvn clean spring-boot:run
\ No newline at end of file
+ command: mvn clean spring-boot:run
+ nginx:
+ container_name: some-nginx
+ image: nginx:1.13
+ restart: always
+ ports:
+ - 80:80
+ links:
+ - app1:app1
+ - app2:app2
+ - app3:app3
+ volumes:
+ - ./nginx/conf.d:/etc/nginx/conf.d
+
\ No newline at end of file
From 86989870ed1af0e4c7c16bca6aa017b7cff768fd Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:13:27 -0300
Subject: [PATCH 03/19] Alterado de app para node-app no app.conf
---
nginx/conf.d/app.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index e7bebbb..07f00ad 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -16,7 +16,7 @@ server {
access_log off;
location / {
- proxy_pass http://app;
+ proxy_pass http://node-app;
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Host $server_name;
From 84572a8ca5aa4700f4d00e4a7cbc8562d0cd290b Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:26:28 -0300
Subject: [PATCH 04/19] alterados os parametros de ports
---
docker-compose.yaml | 37 ++++++++++++++++++-------------------
nginx/conf.d/app.conf | 6 ------
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 41993c2..2488914 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,8 +11,8 @@ services:
working_dir: /app
volumes:
- ./app:/app
- expose:
- - "8081"
+ ports:
+ - 8080:8081
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -22,8 +22,8 @@ services:
working_dir: /app
volumes:
- ./app:/app
- expose:
- - "8082"
+ ports:
+ - 8080:8082
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -33,21 +33,20 @@ services:
working_dir: /app
volumes:
- ./app:/app
- expose:
- - "8083"
+ ports:
+ - 8080:8083
networks:
- dbnet
command: mvn clean spring-boot:run
- nginx:
- container_name: some-nginx
- image: nginx:1.13
- restart: always
- ports:
- - 80:80
- links:
- - app1:app1
- - app2:app2
- - app3:app3
- volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
-
\ No newline at end of file
+ nginx:
+ container_name: some-nginx
+ image: nginx:1.13
+ restart: always
+ ports:
+ - 80:80
+ links:
+ - app1:app1
+ - app2:app2
+ - app3:app3
+ volumes:
+ - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 07f00ad..37b6c7b 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -24,10 +24,4 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
- location /static {
- access_log off;
- expires 30d;
-
- alias /app/static;
- }
}
From 83f0dbc7f0dae6871c9b10230b5d473fb9cba141 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:28:49 -0300
Subject: [PATCH 05/19] corrigida identacao do .yml
---
docker-compose.yaml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2488914..c926928 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -38,15 +38,15 @@ services:
networks:
- dbnet
command: mvn clean spring-boot:run
- nginx:
- container_name: some-nginx
- image: nginx:1.13
- restart: always
- ports:
- - 80:80
- links:
- - app1:app1
- - app2:app2
- - app3:app3
- volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
+ nginx:
+ container_name: some-nginx
+ image: nginx:1.13
+ restart: always
+ ports:
+ - 80:80
+ links:
+ - app1:app1
+ - app2:app2
+ - app3:app3
+ volumes:
+ - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
From 3ebbbaa7c9a83a49c3c352173291a40fd19e6e32 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:31:23 -0300
Subject: [PATCH 06/19] portas alteradas
---
docker-compose.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c926928..ffa06a4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8080:8081
+ - 8081:8080
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -23,7 +23,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8080:8082
+ - 8082:8080
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -34,7 +34,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8080:8083
+ - 8083:8080
networks:
- dbnet
command: mvn clean spring-boot:run
From 573a8beb259f676972b330a1f4b798c897f88825 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:41:08 -0300
Subject: [PATCH 07/19] alterada porta
---
docker-compose.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ffa06a4..7425133 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8081:8080
+ - 8081:8081
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -23,7 +23,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8082:8080
+ - 8082:8082
networks:
- dbnet
command: mvn clean spring-boot:run
@@ -34,7 +34,7 @@ services:
volumes:
- ./app:/app
ports:
- - 8083:8080
+ - 8083:8083
networks:
- dbnet
command: mvn clean spring-boot:run
From 051baab3dd53f532e0a592c214cd6417c604ee57 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 20:54:06 -0300
Subject: [PATCH 08/19] alteradas as portas
---
docker-compose.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7425133..6438ecc 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
- 8081:8081
networks:
- dbnet
- command: mvn clean spring-boot:run
+ command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8081'
app2:
restart: always
build: ./app
@@ -26,7 +26,7 @@ services:
- 8082:8082
networks:
- dbnet
- command: mvn clean spring-boot:run
+ command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8082'
app3:
restart: always
build: ./app
@@ -37,7 +37,7 @@ services:
- 8083:8083
networks:
- dbnet
- command: mvn clean spring-boot:run
+ command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8083'
nginx:
container_name: some-nginx
image: nginx:1.13
From 271634da9e9b5e063027dbfb91c50953b3736d07 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:00:00 -0300
Subject: [PATCH 09/19] adicionado hostname
---
docker-compose.yaml | 3 +++
nginx/conf.d/app.conf | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6438ecc..0749646 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,6 +6,7 @@ networks:
services:
app1:
+ hostname: app1
restart: always
build: ./app
working_dir: /app
@@ -17,6 +18,7 @@ services:
- dbnet
command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8081'
app2:
+ hostname: app2
restart: always
build: ./app
working_dir: /app
@@ -28,6 +30,7 @@ services:
- dbnet
command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8082'
app3:
+ hostname: app3
restart: always
build: ./app
working_dir: /app
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 37b6c7b..5b8bd67 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -5,9 +5,9 @@ events { worker_connections 1024; }
http {
upstream node-app {
least_conn;
- server localhost:8081 weight=10 max_fails=3 fail_timeout=30s;
- server localhost:8082 weight=10 max_fails=3 fail_timeout=30s;
- server localhost:8083 weight=10 max_fails=3 fail_timeout=30s;
+ server app1:8081 weight=10 max_fails=3 fail_timeout=30s;
+ server app2:8082 weight=10 max_fails=3 fail_timeout=30s;
+ server app3:8083 weight=10 max_fails=3 fail_timeout=30s;
}
server {
From 82621977a7111f0bbbbd83d5c19340dcc20511e4 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:04:59 -0300
Subject: [PATCH 10/19] adicionado o /app em cada server
---
nginx/conf.d/app.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 5b8bd67..db4d3e2 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -5,9 +5,9 @@ events { worker_connections 1024; }
http {
upstream node-app {
least_conn;
- server app1:8081 weight=10 max_fails=3 fail_timeout=30s;
- server app2:8082 weight=10 max_fails=3 fail_timeout=30s;
- server app3:8083 weight=10 max_fails=3 fail_timeout=30s;
+ server app1/app:8081 weight=10 max_fails=3 fail_timeout=30s;
+ server app2/app:8082 weight=10 max_fails=3 fail_timeout=30s;
+ server app3/app:8083 weight=10 max_fails=3 fail_timeout=30s;
}
server {
From bc29864dffa47d3c911ebae5da39f4c37569e17b Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:10:01 -0300
Subject: [PATCH 11/19] work process
---
nginx/conf.d/app.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index db4d3e2..3cc0932 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,4 +1,4 @@
-worker_processes auto;
+worker_processes 3;
events { worker_connections 1024; }
From cf8cc340b1af55ff1202062c7e997094d340828c Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:21:29 -0300
Subject: [PATCH 12/19] corrigido o app.conf
---
nginx/conf.d/app.conf | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 3cc0932..44a3b46 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,13 +1,8 @@
-worker_processes 3;
-
-events { worker_connections 1024; }
-
http {
upstream node-app {
- least_conn;
- server app1/app:8081 weight=10 max_fails=3 fail_timeout=30s;
- server app2/app:8082 weight=10 max_fails=3 fail_timeout=30s;
- server app3/app:8083 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8081 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8082 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8083 weight=10 max_fails=3 fail_timeout=30s;
}
server {
@@ -15,7 +10,7 @@ server {
charset utf-8;
access_log off;
- location / {
+ location /app {
proxy_pass http://node-app;
proxy_redirect off;
proxy_set_header Host $host;
@@ -25,3 +20,5 @@ server {
}
}
+
+events { worker_connections 1024; }
From 5126240a400a79e4bb571525fa1434ee56d3a8de Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:28:54 -0300
Subject: [PATCH 13/19] alterado o .yml
---
docker-compose.yaml | 12 ++++++------
nginx/conf.d/app.conf | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0749646..88bffb3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -46,10 +46,10 @@ services:
image: nginx:1.13
restart: always
ports:
- - 80:80
- links:
- - app1:app1
- - app2:app2
- - app3:app3
+ - 80:80
+ depends_on:
+ - "app1"
+ - "app2"
+ - "app3"
volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
+ - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 44a3b46..a47b088 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,8 +1,8 @@
http {
upstream node-app {
- server localhost:8081 weight=10 max_fails=3 fail_timeout=30s;
- server localhost:8082 weight=10 max_fails=3 fail_timeout=30s;
- server localhost:8083 weight=10 max_fails=3 fail_timeout=30s;
+ server localhost:8081;
+ server localhost:8082;
+ server localhost:8083;
}
server {
From 37eb3b5a66123dbf46a1fb62b50e5dbabd4c3e26 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:33:05 -0300
Subject: [PATCH 14/19] alterada a sequencia das chamadas dos servicos
---
docker-compose.yaml | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 88bffb3..f3a71fa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,6 +5,20 @@ networks:
name: dbnet
services:
+ nginx:
+ container_name: some-nginx
+ image: nginx:1.13
+ restart: always
+ ports:
+ - 80:80
+ networks:
+ - dbnet
+ depends_on:
+ - "app1"
+ - "app2"
+ - "app3"
+ volumes:
+ - ./nginx/conf.d:/etc/nginx/conf.d
app1:
hostname: app1
restart: always
@@ -40,16 +54,4 @@ services:
- 8083:8083
networks:
- dbnet
- command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8083'
- nginx:
- container_name: some-nginx
- image: nginx:1.13
- restart: always
- ports:
- - 80:80
- depends_on:
- - "app1"
- - "app2"
- - "app3"
- volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
\ No newline at end of file
+ command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8083'
\ No newline at end of file
From e8e8ec2811a1816563edc6cd4d22aa8e2bc6b5f1 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:37:22 -0300
Subject: [PATCH 15/19] corrigido o app.conf
---
nginx/conf.d/app.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index a47b088..b0706df 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -17,8 +17,8 @@ server {
proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
}
-
}
events { worker_connections 1024; }
From dc72c2d7596ac2bb29a0007d829c950e2a8797b4 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:43:29 -0300
Subject: [PATCH 16/19] identacao
---
nginx/conf.d/app.conf | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index b0706df..8ed264c 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,24 +1,21 @@
http {
- upstream node-app {
- server localhost:8081;
- server localhost:8082;
- server localhost:8083;
- }
-
+ upstream node-app {
+ server localhost:8081;
+ server localhost:8082;
+ server localhost:8083;
+ }
server {
- listen 80;
- charset utf-8;
- access_log off;
-
- location /app {
- proxy_pass http://node-app;
- proxy_redirect off;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-Host $server_name;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- }
+ listen 80;
+ charset utf-8;
+ access_log off;
+ location /app {
+ proxy_pass http://node-app;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ proxy_set_header X-Forwarded-Host $server_name;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
+ }
+ events { worker_connections 1024; }
}
-
-events { worker_connections 1024; }
From 1a1875df48ded90ad81c066dfb58dc841a818ebb Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:46:17 -0300
Subject: [PATCH 17/19] removido o events do app.conf
---
nginx/conf.d/app.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index 8ed264c..e3b9cff 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -17,5 +17,4 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
- events { worker_connections 1024; }
}
From 0ddd91b30a2619bd1b47d8e8f150836bbad7cc90 Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Wed, 26 Feb 2020 21:50:23 -0300
Subject: [PATCH 18/19] app.conf corrigido
---
nginx/conf.d/app.conf | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
index e3b9cff..6c3a21f 100644
--- a/nginx/conf.d/app.conf
+++ b/nginx/conf.d/app.conf
@@ -1,9 +1,6 @@
+worker_processes 3;
+events { worker_connections 1024; }
http {
- upstream node-app {
- server localhost:8081;
- server localhost:8082;
- server localhost:8083;
- }
server {
listen 80;
charset utf-8;
@@ -17,4 +14,9 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
+ upstream node-app {
+ server localhost:8081;
+ server localhost:8082;
+ server localhost:8083;
+ }
}
From 6fc4e6953e3393d2887eebc4ad365ba7cced622c Mon Sep 17 00:00:00 2001
From: armandossrecife <armando.sousa@gmail.com>
Date: Thu, 27 Feb 2020 11:49:05 -0300
Subject: [PATCH 19/19] =?UTF-8?q?Criada=20versao=20para=203=20n=C3=B3s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 3 +++
docker-compose.yaml | 24 ++++++------------------
nginx/conf.d/app.conf | 22 ----------------------
nginx/nginx.conf | 11 +++++++++++
nginx/nginx.dockerfile | 3 +++
5 files changed, 23 insertions(+), 40 deletions(-)
delete mode 100644 nginx/conf.d/app.conf
create mode 100644 nginx/nginx.conf
create mode 100644 nginx/nginx.dockerfile
diff --git a/README.md b/README.md
index a5a9b3a..a0cc6c9 100644
--- a/README.md
+++ b/README.md
@@ -16,3 +16,6 @@
## Run
- Run command `docker-compose up`
- Access to http://localhost/
+
+## Thanks
+https://www.adictosaltrabajo.com/2017/06/22/balanceando-apps-de-spring-boot-con-nginx-en-docker/
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f3a71fa..e745666 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,24 +1,18 @@
version: '3'
-networks:
- dbnet:
- external:
- name: dbnet
-
services:
nginx:
- container_name: some-nginx
- image: nginx:1.13
+ build:
+ dockerfile: ./nginx/nginx.dockerfile
+ context: .
+ container_name: my-nginx
+ image: armandoss/my-nginx
restart: always
ports:
- 80:80
- networks:
- - dbnet
depends_on:
- "app1"
- "app2"
- - "app3"
- volumes:
- - ./nginx/conf.d:/etc/nginx/conf.d
+ - "app3"
app1:
hostname: app1
restart: always
@@ -28,8 +22,6 @@ services:
- ./app:/app
ports:
- 8081:8081
- networks:
- - dbnet
command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8081'
app2:
hostname: app2
@@ -40,8 +32,6 @@ services:
- ./app:/app
ports:
- 8082:8082
- networks:
- - dbnet
command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8082'
app3:
hostname: app3
@@ -52,6 +42,4 @@ services:
- ./app:/app
ports:
- 8083:8083
- networks:
- - dbnet
command: mvn clean spring-boot:run -Drun.jvmArguments='-Dserver.port=8083'
\ No newline at end of file
diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf
deleted file mode 100644
index 6c3a21f..0000000
--- a/nginx/conf.d/app.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-worker_processes 3;
-events { worker_connections 1024; }
-http {
-server {
- listen 80;
- charset utf-8;
- access_log off;
- location /app {
- proxy_pass http://node-app;
- proxy_redirect off;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-Host $server_name;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- }
- }
- upstream node-app {
- server localhost:8081;
- server localhost:8082;
- server localhost:8083;
- }
-}
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100644
index 0000000..c383a76
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,11 @@
+upstream my-app {
+ server 172.17.0.1:8081 weight=1;
+ server 172.17.0.1:8082 weight=1;
+ server 172.17.0.1:8083 weight=1;
+}
+
+server {
+ location / {
+ proxy_pass http://my-app;
+ }
+}
\ No newline at end of file
diff --git a/nginx/nginx.dockerfile b/nginx/nginx.dockerfile
new file mode 100644
index 0000000..794fa16
--- /dev/null
+++ b/nginx/nginx.dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+RUN rm /etc/nginx/conf.d/default.conf
+COPY /nginx/nginx.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file