stanley-king vor 4 Jahren
Ursprung
Commit
cdbf9a25bc
1 geänderte Dateien mit 19 neuen und 105 gelöschten Zeilen
  1. 19 105
      docker-compose-test.yml

+ 19 - 105
docker-compose-test.yml

@@ -1,135 +1,49 @@
 version: "3.7"
 
 services:
-  tnginxsrv:
+  testnginx:
     image: nginx:alpine
     ports:
-      - "80:80"
+      - "8080:8080"
     volumes:
-      - $PWD:/var/www/html
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/nginx/cert:/etc/nginx/cert
-      - $PWD/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD:/var/www/html
     links:
-      - tmobilesrv
-      - tfpmsrv
-    container_name: "xyztest-nginx"
+      - devfpm
+    container_name: "test-nginx"
     command: [nginx,'-g','daemon off;']
 
-  tredisrv:
+  devredis:
     image: redis:alpine
+    ports:
+      - "6380:6379"
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/redis/6379.conf:/usr/local/etc/redis/redis.conf
-      - $PWD/conf/redis:/var/redis
-    container_name: "xyztest-redis"
+    container_name: "dev-redis"
     command: [ "redis-server"]
 
-  tmobilesrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/docker-php-start:/usr/local/bin/docker-php-start
-    links:
-      - tredisrv
-    container_name: "xyztest-mobile"
-    command: ['docker-php-start']
-    depends_on:
-      - "tredisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  tfpmsrv:
+  devfpm:
     image: php-fpm:alpine
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php-fpm/php.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
       - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
-    container_name: "xyztest-web"
+    container_name: "dev-web"
     command: [docker-php-fpm-start]
     depends_on:
-      - "tredisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  tqueuesrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
-    links:
-      - tredisrv
-    container_name: "xyztest-queue"
-    command: [docker-queue-start]
-    depends_on:
-      - "tredisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  tsearchsrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/searcher/docker-search-start:/usr/local/bin/docker-start
-    links:
-      - tredisrv
-    container_name: "xyztest-searcher"
-    command: [docker-start]
-    depends_on:
-      - "tredisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  tcrontabsrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/crontab/root:/var/spool/cron/crontabs/root
-      - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
-    links:
-      - tredisrv
-    container_name: "xyztest-crontab"
-    command: [docker-start]
-    depends_on:
-      - "tredisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
+      - devredis
 
-  tphpcli:
+  devphp:
     image: php-zts-debug:7.3.18
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
     links:
-      - tredisrv
-    container_name: "xyztest-php"
+      - devredis
+    container_name: "dev-php"
     depends_on:
-      - "tredisrv"
-      - "tfpmsrv"
-      - "tsearchsrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
+      - "devredis"