From 3581b901e40dc6c26aeb5a14b7fe076203246d7a Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:48:19 +0100 Subject: [PATCH 01/12] Update evemonk-pghero to 1.1.30 --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 70f8775..7048be7 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -356,7 +356,7 @@ services: - "POSTMASTER_ADDRESS=igor.zubkov@gmail.com" pghero: - image: "docker.io/biow0lf/evemonk-pghero:v1.1.29" + image: "docker.io/biow0lf/evemonk-pghero:v1.1.30" container_name: "evemonk_pghero" restart: "unless-stopped" env_file: "./evemonk-pghero/.env" From 45e10becc33f51c9d5a2ad768e443484cba88b4f Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:48:32 +0100 Subject: [PATCH 02/12] Update evemonk-sidekiq to 1.1.30 --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 7048be7..b97f3c0 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -363,7 +363,7 @@ services: read_only: true sidekiq-web-ui: - image: "docker.io/biow0lf/evemonk-sidekiq:v1.1.29" + image: "docker.io/biow0lf/evemonk-sidekiq:v1.1.30" container_name: "evemonk_sidekiq_web_ui" restart: "unless-stopped" env_file: "./evemonk-sidekiq-ui/.env" From f1fae6b183d8c0944d4f902d3f668f1626fbe514 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:48:47 +0100 Subject: [PATCH 03/12] Update evemonk-pg-extras to 1.1.30 --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index b97f3c0..72b2eac 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -370,7 +370,7 @@ services: read_only: true pg-extras: - image: "docker.io/biow0lf/evemonk-pg-extras:v1.1.29" + image: "docker.io/biow0lf/evemonk-pg-extras:v1.1.30" container_name: "evemonk_pg_extras" restart: "unless-stopped" env_file: "./evemonk-pg-extras/.env" From d3740c3ba0220ca0614dd4b1c0aa4c48f94a8698 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:49:50 +0100 Subject: [PATCH 04/12] Update evemonk to 0.8.23 --- evemonk/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 72b2eac..203ec5f 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -377,7 +377,7 @@ services: read_only: true backend: - image: "docker.io/biow0lf/evemonk:v0.8.22" + image: "docker.io/biow0lf/evemonk:v0.8.23" container_name: "evemonk_backend" restart: "unless-stopped" # read_only: true @@ -388,7 +388,7 @@ services: - "./evemonk/airbrake.rb:/app/config/initializers/airbrake.rb:ro" sidekiq: - image: "docker.io/biow0lf/evemonk:v0.8.22" + image: "docker.io/biow0lf/evemonk:v0.8.23" container_name: "evemonk_sidekiq" restart: "unless-stopped" # read_only: true @@ -403,7 +403,7 @@ services: - "./evemonk/airbrake.rb:/app/config/initializers/airbrake.rb:ro" cron: - image: "docker.io/biow0lf/evemonk:v0.8.22" + image: "docker.io/biow0lf/evemonk:v0.8.23" container_name: "evemonk_cron" restart: "unless-stopped" # read_only: true From 766709ffc767fb251dd8190ecef288c597ce15ce Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:51:14 +0100 Subject: [PATCH 05/12] Update postgres to 13.10 --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 203ec5f..bf8f4bd 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -120,7 +120,7 @@ services: - "--memcached.address=memcached:11211" postgresql: - image: "docker.io/library/postgres:13.9" + image: "docker.io/library/postgres:13.10" container_name: "evemonk_postgresql" restart: "unless-stopped" environment: From 673f53e5c2a016da0a09caf67e6ffa511d101a73 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:51:36 +0100 Subject: [PATCH 06/12] Update postgres to 13.10 --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index bf8f4bd..a10429c 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -229,7 +229,7 @@ services: - "geoip_data:/usr/share/GeoIP:rw" plausible_db: - image: "docker.io/library/postgres:13.9" + image: "docker.io/library/postgres:13.10" container_name: "evemonk_plausible_db" restart: "unless-stopped" environment: From d43d7cd968d8d68cb5b2ce4d0dfc0d381823de63 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Fri, 10 Feb 2023 13:29:26 +0100 Subject: [PATCH 07/12] Add traefik container --- evemonk/docker-compose.yml | 116 +++++++++++++++++++++---------------- evemonk/letsencrypt/.keep | 0 2 files changed, 65 insertions(+), 51 deletions(-) create mode 100644 evemonk/letsencrypt/.keep diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index a10429c..55251ec 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -24,73 +24,87 @@ volumes: diun_data: {} services: - nginx: - image: "docker.io/library/nginx:1.22.1" - container_name: "evemonk_nginx" + traefik: + image: "docker.io/library/traefik:v2.9.6" + container_name: "evemonk_traefik" restart: "unless-stopped" + command: + - "--providers.docker=true" + - "--providers.docker.exposedByDefault=false" + ports: + - "443:443" + - "80:8080" volumes: - - "./nginx-evemonk.conf:/etc/nginx/conf.d/default.conf:ro" + - "./letsencrypt:/letsencrypt" + - "/var/run/docker.sock:/var/run/docker.sock:ro" - pghero_nginx: - image: "docker.io/library/nginx:1.22.1" - container_name: "evemonk_pghero_nginx" - restart: "unless-stopped" - volumes: - - "./evemonk-pghero-nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro" +# nginx: +# image: "docker.io/library/nginx:1.22.1" +# container_name: "evemonk_nginx" +# restart: "unless-stopped" +# volumes: +# - "./nginx-evemonk.conf:/etc/nginx/conf.d/default.conf:ro" - nginx_static: - image: "docker.io/library/nginx:1.22.1" - container_name: "evemonk_nginx_static" - restart: "unless-stopped" - volumes: - - "/srv/static:/var/www:ro" - - "./nginx-static.conf:/etc/nginx/conf.d/default.conf:ro" +# pghero_nginx: +# image: "docker.io/library/nginx:1.22.1" +# container_name: "evemonk_pghero_nginx" +# restart: "unless-stopped" +# volumes: +# - "./evemonk-pghero-nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro" + +# nginx_static: +# image: "docker.io/library/nginx:1.22.1" +# container_name: "evemonk_nginx_static" +# restart: "unless-stopped" +# volumes: +# - "/srv/static:/var/www:ro" +# - "./nginx-static.conf:/etc/nginx/conf.d/default.conf:ro" # blog: # image: "biow0lf/evemonk-blog:latest" # container_name: "evemonk_blog" # restart: "unless-stopped" - blog: - image: "docker.io/library/nginx:1.22.1" - container_name: "evemonk_blog" - restart: "unless-stopped" +# blog: +# image: "docker.io/library/nginx:1.22.1" +# container_name: "evemonk_blog" +# restart: "unless-stopped" # nginx_exporter: # image: "docker.io/nginx/nginx-prometheus-exporter:0.8.0" # container_name: "evemonk_nginx_exporter" # restart: "unless-stopped" - https_portal: - image: "docker.io/steveltn/https-portal:1.23.0" - container_name: "evemonk_https_portal" - restart: "unless-stopped" - ports: - - "80:80" - - "443:443" - volumes: - - "https_portal:/var/lib/https-portal:rw" - - "https_logs:/var/log/nginx:rw" - environment: - STAGE: "production" - WEBSOCKET: "true" - LISTEN_IPV6: "true" - DOMAINS: "evemonk.com -> http://nginx, - blog.evemonk.com -> http://blog, - static.evemonk.com -> http://nginx_static, - www.evemonk.com => https://evemonk.com, - mail.evemonk.com, - irregularquiz.rpisarev.org.ua -> http://irregularquiz:5000, - imageproxy.evemonk.com -> http://imageproxy:8081, - username:password@cadvisor.evemonk.com -> http://cadvisor:8080, - pghero.evemonk.com -> http://pghero_nginx, - pg-extras.evemonk.com -> http://nginx, - username:password@sidekiq.evemonk.com -> http://nginx, - grafana.evemonk.com -> http://grafana:3000, - errbit.evemonk.com -> http://errbit:8080, - plausible.evemonk.com -> http://plausible:8000, - username:password@prometheus.evemonk.com -> http://prometheus:9090, - username:password@alertmanager.evemonk.com -> http://alertmanager:9093" +# https_portal: +# image: "docker.io/steveltn/https-portal:1.23.0" +# container_name: "evemonk_https_portal" +# restart: "unless-stopped" +# ports: +# - "80:80" +# - "443:443" +# volumes: +# - "https_portal:/var/lib/https-portal:rw" +# - "https_logs:/var/log/nginx:rw" +# environment: +# STAGE: "production" +# WEBSOCKET: "true" +# LISTEN_IPV6: "true" +# DOMAINS: "evemonk.com -> http://nginx, +# blog.evemonk.com -> http://blog, +# static.evemonk.com -> http://nginx_static, +# www.evemonk.com => https://evemonk.com, +# mail.evemonk.com, +# irregularquiz.rpisarev.org.ua -> http://irregularquiz:5000, +# imageproxy.evemonk.com -> http://imageproxy:8081, +# username:password@cadvisor.evemonk.com -> http://cadvisor:8080, +# pghero.evemonk.com -> http://pghero_nginx, +# pg-extras.evemonk.com -> http://nginx, +# username:password@sidekiq.evemonk.com -> http://nginx, +# grafana.evemonk.com -> http://grafana:3000, +# errbit.evemonk.com -> http://errbit:8080, +# plausible.evemonk.com -> http://plausible:8000, +# username:password@prometheus.evemonk.com -> http://prometheus:9090, +# username:password@alertmanager.evemonk.com -> http://alertmanager:9093" redis: image: "docker.io/library/redis:7.0.8" diff --git a/evemonk/letsencrypt/.keep b/evemonk/letsencrypt/.keep new file mode 100644 index 0000000..e69de29 From 7d17c871202d9c7b9841929298e4032a100e6d92 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Fri, 10 Feb 2023 14:31:52 +0100 Subject: [PATCH 08/12] Update traefik configuration --- evemonk/docker-compose.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 55251ec..230c76e 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -29,11 +29,14 @@ services: container_name: "evemonk_traefik" restart: "unless-stopped" command: + - "--logLevel=DEBUG" + - "--entrypoints.web.address=:80" + - "--entrypoints.websecure.address=:443" - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" ports: + - "80:80" - "443:443" - - "80:8080" volumes: - "./letsencrypt:/letsencrypt" - "/var/run/docker.sock:/var/run/docker.sock:ro" @@ -400,6 +403,8 @@ services: volumes: - "/srv/static/sde-20220716:/app/static:ro" - "./evemonk/airbrake.rb:/app/config/initializers/airbrake.rb:ro" + labels: + - "traefik.enable=true" sidekiq: image: "docker.io/biow0lf/evemonk:v0.8.23" From 949d11eccb9cc6ed70a540dd0bc7161f3ffb6ec2 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Fri, 10 Feb 2023 14:38:45 +0100 Subject: [PATCH 09/12] Update traefik configuration --- evemonk/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 230c76e..0a78992 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -34,6 +34,9 @@ services: - "--entrypoints.websecure.address=:443" - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" + - "--certificatesresolvers.letsencrypt.acme.email=igor.zubkov@gmail.com" +# - "--certificatesresolvers.letsencrypt.acme.storage=acme.json" + - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web" ports: - "80:80" - "443:443" @@ -405,6 +408,9 @@ services: - "./evemonk/airbrake.rb:/app/config/initializers/airbrake.rb:ro" labels: - "traefik.enable=true" + - "traefik.http.routers.blog.rule=Host(`evemonk.com`)" + - "traefik.http.routers.blog.tls=true" + - "traefik.http.routers.blog.tls.certresolver=letsencrypt" sidekiq: image: "docker.io/biow0lf/evemonk:v0.8.23" From 2e43cf1e79630990afff7569481a82c9e3a6e54f Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Fri, 10 Feb 2023 14:40:27 +0100 Subject: [PATCH 10/12] Update traefik configuration --- evemonk/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index 0a78992..b7ea522 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -35,7 +35,7 @@ services: - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" - "--certificatesresolvers.letsencrypt.acme.email=igor.zubkov@gmail.com" -# - "--certificatesresolvers.letsencrypt.acme.storage=acme.json" + - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web" ports: - "80:80" From 45ab580345faade48128b22d6a2ecd385245d7cc Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Fri, 10 Feb 2023 14:41:08 +0100 Subject: [PATCH 11/12] Update traefik configuration --- evemonk/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index b7ea522..cc38184 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -408,9 +408,9 @@ services: - "./evemonk/airbrake.rb:/app/config/initializers/airbrake.rb:ro" labels: - "traefik.enable=true" - - "traefik.http.routers.blog.rule=Host(`evemonk.com`)" - - "traefik.http.routers.blog.tls=true" - - "traefik.http.routers.blog.tls.certresolver=letsencrypt" + - "traefik.http.routers.backend.rule=Host(`evemonk.com`)" + - "traefik.http.routers.backend.tls=true" + - "traefik.http.routers.backend.tls.certresolver=letsencrypt" sidekiq: image: "docker.io/biow0lf/evemonk:v0.8.23" From 5bf246e41bc42e258a62d59e8d7872f5818a16f2 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 11 Feb 2023 11:24:38 +0100 Subject: [PATCH 12/12] Update traefik configuration --- evemonk/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/evemonk/docker-compose.yml b/evemonk/docker-compose.yml index cc38184..576de8d 100644 --- a/evemonk/docker-compose.yml +++ b/evemonk/docker-compose.yml @@ -34,6 +34,7 @@ services: - "--entrypoints.websecure.address=:443" - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" + - "--certificatesresolvers.letsencrypt.acme.tlschallenge=true" - "--certificatesresolvers.letsencrypt.acme.email=igor.zubkov@gmail.com" - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"