stanley-king 4 rokov pred
rodič
commit
e2d2a821b4
2 zmenil súbory, kde vykonal 9 pridanie a 9 odobranie
  1. 2 2
      data/config/test/base.ini.php
  2. 7 7
      docker-compose-test.yml

+ 2 - 2
data/config/test/base.ini.php

@@ -48,14 +48,14 @@ $config['db'][1]['dbhost']       = 'docker.hostip';
 $config['db'][1]['dbport']       = '3306';
 $config['db'][1]['dbuser']       = 'root';
 $config['db'][1]['dbpwd']        = 'XTZ@shop@951688';
-$config['db'][1]['dbname']       = 'xyzshop';
+$config['db'][1]['dbname']       = 'xyztest';
 $config['db'][1]['dbcharset']    = 'UTF-8';
 
 $config['db']['slave'][0]['dbhost']     = 'docker.hostip';
 $config['db']['slave'][0]['dbport']     = '3306';
 $config['db']['slave'][0]['dbuser']     = 'root';
 $config['db']['slave'][0]['dbpwd']      = 'XTZ@shop@951688';
-$config['db']['slave'][0]['dbname']     = 'xyzshop';
+$config['db']['slave'][0]['dbname']     = 'xyztest';
 $config['db']['slave'][0]['dbcharset']  = 'UTF-8';
 
 $config['session_expire'] 	= 3600;

+ 7 - 7
docker-compose-test.yml

@@ -8,7 +8,7 @@ services:
     volumes:
       - $PWD:/var/www/html
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/nginx/cert:/etc/nginx/cert
       - $PWD/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
     links:
@@ -32,7 +32,7 @@ services:
       - $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
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/docker-php-start:/usr/local/bin/docker-spwan-start
     links:
       - tredisrv
@@ -49,7 +49,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php-fpm/php.ini:/usr/local/etc/php/php.ini
       - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
     container_name: "xyztest-web"
@@ -65,7 +65,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
     links:
       - tredisrv
@@ -82,7 +82,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
     links:
       - tredisrv
@@ -99,7 +99,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/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
     links:
@@ -118,7 +118,7 @@ services:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
     links:
       - tredisrv
     container_name: "xyztest-php"