update

.env

@@ -1,10 +1,10 @@
 COMPOSE_PROJECT_NAME=testb
 NETWORK=testb
 
-FRONT_TAG=develop
+FRONT_TAG=DD-3776-STORY
-DOTDOT_TAG=DD-3834
+DOTDOT_TAG=DD-3776-STORY
-LMS_TAG=develop
+LMS_TAG=DD-3776-STORY
-ADMIN_TAG=dashboard
+ADMIN_TAG=master
 CABINET_TAG=master
 
 MYSQL_PORT=0.0.0.0:33062

configs/nginx/conf.d/admin.conf

@@ -17,7 +17,7 @@ server {
     error_log /var/log/nginx/testbadmin.dot-dot.ru_error.log;
 
     location / {
-        proxy_pass https://testb-admin-1:443;
+        proxy_pass https://admin:443;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';

configs/nginx/conf.d/default.conf

@@ -116,35 +116,31 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     }
 
-    location /mysql_exporter {
+    # location /mysql_exporter {
-        access_log /var/log/nginx/mysql_exporter_access.log json;
+    #     access_log /var/log/nginx/mysql_exporter_access.log json;
-        error_log /var/log/nginx/mysql_exporter_error.log;
+    #     error_log /var/log/nginx/mysql_exporter_error.log;
 
-        #if ($allow = 0) {
+    #     #if ($allow = 0) {
-        #    return 403;
+    #     #    return 403;
+    #     #}
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header X-Scheme $scheme;
+    #     proxy_set_header Host $http_host;
+    #     proxy_redirect off;
+    #     proxy_http_version 1.1;
+    #     proxy_pass http://mysqld-exporter:9104/metrics;
     # }
-
+    # location /redis_exporter {
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     access_log /var/log/nginx/mysql_exporter_access.log json;
-        proxy_set_header X-Scheme $scheme;
+    #     error_log /var/log/nginx/mysql_exporter_error.log;
-        proxy_set_header Host $http_host;
+    #     #if ($allow = 0) {
-        proxy_redirect off;
+    #     #    return 403;
-        proxy_http_version 1.1;
+    #     #}
-        proxy_pass http://mysqld-exporter:9104/metrics;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
+    #     proxy_set_header X-Scheme $scheme;
-
+    #     proxy_set_header Host $http_host;
-    location /redis_exporter {
+    #     proxy_redirect off;
-        access_log /var/log/nginx/mysql_exporter_access.log json;
+    #     proxy_http_version 1.1;
-        error_log /var/log/nginx/mysql_exporter_error.log;
+    #     proxy_pass http://redis-exporter:9121/metrics;
-
-        #if ($allow = 0) {
-        #    return 403;
     # }
-
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-        proxy_http_version 1.1;
-        proxy_pass http://redis-exporter:9121/metrics;
-    }
 }

docker-compose.yml

@@ -113,12 +113,12 @@ services:
 
   admin:
     image: registry.dot-dot.ru/admin:${ADMIN_TAG}
-    # user: www-data
-    # command: frankenphp php-server -r /application/public
-    command: sh -c 'php-fpm -D; nginx'
     restart: unless-stopped
+    command: sh -c 'php-fpm -D; nginx'
     volumes:
+      - ./configs/admin/default:/etc/nginx/sites-enabled/default
       - ./configs/admin/.env:/application/.env
+      - ./configs/nginx/ssl:/etc/nginx/ssl
     depends_on:
       - db
     networks: