refactored docker db-tests

yiisoft · Jan 18, 2017 · 5a791fb · 5a791fb
1 parent b4479b0
commit 5a791fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/tests/cubrid/.env b/tests/cubrid/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=yii2testcubrid
diff --git a/tests/docker-compose.cubrid.yml → tests/cubrid/docker-compose.yml b/tests/docker-compose.cubrid.yml → tests/cubrid/docker-compose.yml
@@ -3,12 +3,12 @@ services:
 
   php:
     build:
-      context: ..
+      context: ../..
       dockerfile: Dockerfile-cubrid
     ports:
       - 80
     #volumes:
-    #  - ../:/project
+    #  - ../..:/project
     depends_on:
       - cubrid
 

diff --git a/tests/docker/mssql/.env → tests/mssql/.env b/tests/docker/mssql/.env → tests/mssql/.env
diff --git a/tests/docker/mssql/docker-compose.yml → tests/mssql/docker-compose.yml b/tests/docker/mssql/docker-compose.yml → tests/mssql/docker-compose.yml
@@ -2,20 +2,23 @@ version: '2'
 services:
 
   php:
-    #image: ppoffice/apache-php-mssql-odbc
     build:
-      context: ../../..
+      context: ../..
       dockerfile: Dockerfile-mssql
+    # Alternative pre-built image (TODO: evaluate)
+    #image: ppoffice/apache-php-mssql-odbc
     entrypoint: ['bash']
     ports:
       - 80
+    # Enable for debugging, Note: File-cache tests may be VERY slow or fail
     #volumes:
     #  - ../../..:/project
     depends_on:
       - mssql
 
   mssql:
     image: microsoft/mssql-server-linux
+    # Alternative pre-built image (TODO: evaluate)
     #image: microsoft/mssql-server-windows
     environment:
       - ACCEPT_EULA=Y
@@ -24,5 +27,6 @@ services:
   sqlcmd:
     image: tsgkadot/mssql-tools
     entrypoint: bash
+    # Mount project for accessing SQL dump (TODO)
     volumes:
-      - ../../..:/project
+      - ../..:/project