dev

docker/compose/gx/conf/nginx/nginx_admin.conf

@@ -111,8 +111,8 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-#             fastcgi_pass   gxweb:9000;
-            fastcgi_pass   docker.hostip:9700;
+            fastcgi_pass   gxweb:9000;
+#             fastcgi_pass   docker.hostip:9700;
 
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;

docker/compose/gx/gx-admin/docker-compose.yml

@@ -16,9 +16,8 @@ services:
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-
-#    networks:
-#      - net_gxshop
+    networks:
+      - net_gxshop
 
   gxmch:
     image: php-zts:7.3.18
@@ -32,8 +31,8 @@ services:
     container_name: "gx-merchant"
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-#    networks:
-#      - net_gxshop
+    networks:
+      - net_gxshop
 
   gxweb:
     image: php-fpm:alpine
@@ -50,11 +49,9 @@ services:
     command: [php-fpm]
     extra_hosts:
       - "docker.hostip:172.17.0.1"
+    networks:
+      - net_gxshop
 
-
-#    networks:
-#      - net_gxshop
-
-#networks:
-#  net_gxshop:
-#    external: true
+networks:
+  net_gxshop:
+    external: true

index.php

@@ -1,8 +1,5 @@
 <?php
 declare(strict_types=0);
 
-$site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/index.php')).'/shop/index.php');
-//include('shop/index.php');
-//header('Location: /icp/index.html');
-
-echo("test");
+//$site_url = strtolower('http://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/index.php')).'/shop/index.php');
+//include('shop/index.php');