From ac4c5b56f3330216c54c303919c1210e947606f4 Mon Sep 17 00:00:00 2001 From: Yutsuo Date: Fri, 23 Nov 2018 13:01:04 -0200 Subject: [PATCH] Task 5 lets go --- docker-compose.yml | 11 +++++++++-- nginx/Dockerfile | 3 +++ nginx/nginx.conf | 18 ------------------ 3 files changed, 12 insertions(+), 20 deletions(-) create mode 100644 nginx/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 35737e5..6f02efa 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,12 @@ version: '3' services: + nginx: + container_name: nginx + restart: always + build: ./nginx + image: custom/nginx + ports: + - 8080:8080 app: container_name: app depends_on: @@ -10,8 +17,8 @@ services: # environment: # mongousr: myTester # mongopwd: test - ports: - - '3001:3001' + # ports: + # - '3001:3001' links: - mongo mongo: diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 0000000..d6eac3e --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/nginx/nginx.conf b/nginx/nginx.conf index e3c47fc..49ffa91 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -10,10 +10,6 @@ http { server app:3001; } - upstream mongo { - server mongo:27017; - } - server { listen 8080; @@ -26,18 +22,4 @@ http { proxy_set_header X-Forwarded-Host $server_name; } } - - server { - listen 8081; - - location / { - proxy_pass http://mongo; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - } - } - } \ No newline at end of file