From dd7542bb83e396f9d72affe21c665ad6974ca00c Mon Sep 17 00:00:00 2001 From: SergeyLadutko Date: Mon, 4 May 2020 16:39:59 +0300 Subject: [PATCH 1/4] [Hometask_7] docker --- .../docker-compose.yml | 42 +++++++++++++++++++ .../first/Dockerfile | 4 ++ .../first/index.html | 1 + .../loadbalansernginxconf/nginx.conf | 25 +++++++++++ .../second/index.html | 1 + 5 files changed, 73 insertions(+) create mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml create mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/Dockerfile create mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/index.html create mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf create mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/second/index.html diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml new file mode 100644 index 0000000..c267b0a --- /dev/null +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml @@ -0,0 +1,42 @@ +version: '3.3' +services: + loadbalanser: + image: nginx + restart: always + logging: + driver: journald + options: + tag: project1 + depends_on: + - firstnginx + - secondnginx + volumes: + - "./loadbalansernginxconf/nginx.conf:/etc/nginx/nginx.conf" + ports: + - "1113:80" + + firstnginx: + build: ./first + restart: always + logging: + driver: journald + options: + tag: project1 + + secondnginx: + image: nginx + restart: always + volumes: + - "./second/:/usr/share/nginx/html" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:80"] + interval: 1m30s + timeout: 10s + retries: 3 + logging: + driver: journald + options: + tag: project1 + + + \ No newline at end of file diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/Dockerfile b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/Dockerfile new file mode 100644 index 0000000..f8de104 --- /dev/null +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:alpine +COPY index.html /usr/share/nginx/html +HEALTHCHECK --interval=5m --timeout=3s \ + CMD curl -f http://localhost:80 || exit 1 \ No newline at end of file diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/index.html b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/index.html new file mode 100644 index 0000000..dbc33c7 --- /dev/null +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/first/index.html @@ -0,0 +1 @@ +

HELLO MY FIRST SERVER

\ No newline at end of file diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf new file mode 100644 index 0000000..123058b --- /dev/null +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf @@ -0,0 +1,25 @@ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; +events { + worker_connections 1024; +} +http { + upstream backend { + server firstnginx; + server secondnginx; + } + +server { + listen 80; + root /var/www/example.com/html; + index index.html index.htm index.nginx-debian.html; + + server_name localhost; + + location / { + proxy_pass http://backend; + } + } +} \ No newline at end of file diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/second/index.html b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/second/index.html new file mode 100644 index 0000000..a3abc27 --- /dev/null +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/second/index.html @@ -0,0 +1 @@ +

HELLO MY SECOND SERVER

\ No newline at end of file From a6dfe45d108c475e86dc8cf4451f4acf39347de7 Mon Sep 17 00:00:00 2001 From: SergeyLadutko Date: Mon, 4 May 2020 17:15:56 +0300 Subject: [PATCH 2/4] rename services and fix loadbalansernginxconf --- .../docker-compose.yml | 9 +++---- .../loadbalansernginxconf/nginx.conf | 25 ----------------- .../loadbalan\321\201ernginxconf/nginx.conf" | 27 +++++++++++++++++++ 3 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf create mode 100644 "Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml index c267b0a..45d667d 100644 --- a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.3' services: - loadbalanser: + loadbalancer: image: nginx restart: always logging: @@ -11,7 +11,7 @@ services: - firstnginx - secondnginx volumes: - - "./loadbalansernginxconf/nginx.conf:/etc/nginx/nginx.conf" + - "./loadbalanсernginxconf/nginx.conf:/etc/nginx/nginx.conf" ports: - "1113:80" @@ -36,7 +36,4 @@ services: logging: driver: journald options: - tag: project1 - - - \ No newline at end of file + tag: project1 \ No newline at end of file diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf deleted file mode 100644 index 123058b..0000000 --- a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalansernginxconf/nginx.conf +++ /dev/null @@ -1,25 +0,0 @@ -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; -events { - worker_connections 1024; -} -http { - upstream backend { - server firstnginx; - server secondnginx; - } - -server { - listen 80; - root /var/www/example.com/html; - index index.html index.htm index.nginx-debian.html; - - server_name localhost; - - location / { - proxy_pass http://backend; - } - } -} \ No newline at end of file diff --git "a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" "b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" new file mode 100644 index 0000000..f25aca9 --- /dev/null +++ "b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" @@ -0,0 +1,27 @@ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + upstream backend { + server firstnginx; + server secondnginx; + } + +server { + listen 80; + root /var/www/example.com/html; + index index.html index.htm index.nginx-debian.html; + + server_name localhost; + + location / { + proxy_pass http://backend; + } + } +} \ No newline at end of file From 44bb37b02c08200cc6555ed0c093500054c7a5db Mon Sep 17 00:00:00 2001 From: SergeyLadutko Date: Mon, 4 May 2020 22:46:55 +0300 Subject: [PATCH 3/4] update loadbalancerconfig --- .../docker-compose.yml | 6 +++--- .../loadbalan\321\201ernginxconf/nginx.conf" | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml index 45d667d..bd8c579 100644 --- a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml @@ -6,7 +6,7 @@ services: logging: driver: journald options: - tag: project1 + tag: hometask_7 depends_on: - firstnginx - secondnginx @@ -21,7 +21,7 @@ services: logging: driver: journald options: - tag: project1 + tag: hometask_7 secondnginx: image: nginx @@ -36,4 +36,4 @@ services: logging: driver: journald options: - tag: project1 \ No newline at end of file + tag: hometask_7 \ No newline at end of file diff --git "a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" "b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" index f25aca9..6d81d37 100644 --- "a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" +++ "b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/loadbalan\321\201ernginxconf/nginx.conf" @@ -11,17 +11,17 @@ http { upstream backend { server firstnginx; server secondnginx; - } + } -server { - listen 80; - root /var/www/example.com/html; - index index.html index.htm index.nginx-debian.html; + server { + listen 80; + root /var/www/example.com/html; + index index.html index.htm index.nginx-debian.html; - server_name localhost; + server_name localhost; - location / { + location / { proxy_pass http://backend; + } } - } } \ No newline at end of file From 4a32c31bcb28a414649cb8bc8d3e5670ee2bf625 Mon Sep 17 00:00:00 2001 From: SergeyLadutko Date: Tue, 5 May 2020 14:52:17 +0300 Subject: [PATCH 4/4] update loadbalancerconfig --- .../docker-compose-loadbalanser-nginx/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml index bd8c579..df26622 100644 --- a/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml +++ b/Sergey_Ladutko/docker-compose-loadbalanser-nginx/docker-compose.yml @@ -6,7 +6,7 @@ services: logging: driver: journald options: - tag: hometask_7 + tag: hometask_7_loadbalancer depends_on: - firstnginx - secondnginx @@ -21,7 +21,7 @@ services: logging: driver: journald options: - tag: hometask_7 + tag: hometask_7_firstnginx secondnginx: image: nginx @@ -36,4 +36,4 @@ services: logging: driver: journald options: - tag: hometask_7 \ No newline at end of file + tag: hometask_7_secondnginx \ No newline at end of file