stanley-king 3 gadi atpakaļ
vecāks
revīzija
f62ffa85c3

+ 3 - 0
.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "esbonio.server.enabled": true
+}

+ 9 - 9
docker/compose/yl/acc/docker-compose.yml

@@ -1,17 +1,17 @@
 version: "3.7"
 
 services:
-  nginxsrv:
+  nginx:
     image: nginx:alpine
     ports:
-      - "80:80"
+      - "8000:80"
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/merchant:/var/www/html/merchant
-    container_name: "panda-nginx"
+      - /nfs/ylupload:/var/www/html/data/upload
+      - /nfs/ylmerchant:/var/www/html/merchant
+    container_name: "yl-acc-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
@@ -20,7 +20,7 @@ services:
         limits:
           cpus: '8'
 
-  mobilesrv:
+  mobile:
     image: php-zts:7.3.18
     ports:
       - "9100:9100"
@@ -28,10 +28,10 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
+      - /nfs/ylupload:/var/www/html/data/upload
+      - /mnt/yllog:/var/www/html/data/log
       - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
-    container_name: "panda-mobile"
+    container_name: "yl-mobile"
     command: ['docker-spwan-start']
     deploy:
       resources:

+ 0 - 20
docker/compose/yl/accip/docker-compose.yml

@@ -1,20 +0,0 @@
-version: "3.7"
-
-services:
-  nginxipsrv:
-    image: nginx:alpine
-    ports:
-      - "8080:80"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginxip.conf:/etc/nginx/nginx.conf:ro
-      - /nfs/upload:/var/www/html/data/upload
-    container_name: "panda-nginxip"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-    deploy:
-      resources:
-        limits:
-          cpus: '8'