From 73ad481f0dd9f1324b4bad08b62c5a2a4c546dbe Mon Sep 17 00:00:00 2001 From: Hadis-Fard Date: Mon, 31 Jul 2017 15:35:21 -0700 Subject: [PATCH] added network inspection and sqlcmd logins --- .travis.yml | 7 ++++--- Dockerfile-msphpsql | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9910d6e..94fc81d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,13 +26,14 @@ install: script: - docker logs sql - - - docker run -e TRAVIS_JOB_ID -t -d -w $PHPSQLDIR --link $TEST_PHP_SQL_SERVER --name=client msphpsql-dev + - docker run -e TRAVIS_JOB_ID -t -d -w $PHPSQLDIR --name=client --link $TEST_PHP_SQL_SERVER msphpsql-dev + - docker network ls + - docker inspect -f "{{ .HostConfig.Links }}" client - docker logs client - docker ps -a - docker exec client python ./test/functional/setup/setup_dbs.py -dbname $SQLSRV_DBNAME - docker exec client python ./test/functional/setup/setup_dbs.py -dbname $PDOSQLSRV_DBNAME - - docker exec client php ./source/pdo_sqlsrv/run-tests.php ./test/functional/pdo_sqlsrv/*.phpt + - docker exec client php ./test/functional/pdo_sqlsrv/*.phpt - docker exec client php ./source/sqlsrv/run-tests.php ./test/functional/sqlsrv/*.phpt - docker exec client bash -c 'for f in ./test/functional/sqlsrv/*.diff; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' - docker exec client bash -c 'for f in ./test/functional/sqlsrv/*.out; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index 62f92d22..49fd75cb 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -49,6 +49,8 @@ RUN echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile RUN echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc RUN /bin/bash -c "source ~/.bashrc" +RUN chmod +x ./Dockerfile-msphpsql-entrypoint.sh +CMD /bin/bash ./Dockerfile-msphpsql-entrypoint.sh #install coveralls RUN pip install --upgrade pip && pip install cpp-coveralls