From ac630b050000c872003c4e69fbaf0bc45df60862 Mon Sep 17 00:00:00 2001 From: Hadis-Fard Date: Tue, 1 Aug 2017 18:18:52 -0700 Subject: [PATCH] added CMD --- .travis.yml | 4 +++- Dockerfile-msphpsql | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcddf8f5..a8465962 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,15 @@ before_install: - docker pull microsoft/mssql-server-linux install: - - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d microsoft/mssql-server-linux + - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d microsoft/mssql-server-linux - docker build --build-arg PHPSQLDIR=$PHPSQLDIR -t msphpsql-dev -f Dockerfile-msphpsql . script: - docker logs sql - docker run -e TRAVIS_JOB_ID -t -d -w $PHPSQLDIR --name=client --link $TEST_PHP_SQL_SERVER msphpsql-dev - 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 logs client - docker exec client php ./source/sqlsrv/run-tests.php ./test/functional/pdo_sqlsrv/*.phpt - docker exec client php ./source/sqlsrv/run-tests.php ./test/functional/sqlsrv/*.phpt diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index 262120da..d47b99a2 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -80,11 +80,7 @@ RUN sed -i -e 's/TARGET_PASSWORD/'"$TEST_PHP_SQL_PWD"'/g' MsSetup.inc WORKDIR $PHPSQLDIR RUN chmod +x ./entrypoint.sh -RUN /bin/bash -c ./entrypoint.sh - -WORKDIR $PHPSQLDIR /test/functional/setup/ -RUN python ./setup_dbs.py -dbname $SQLSRV_DBNAME -RUN python ./setup_dbs.py -dbname $PDOSQLSRV_DBNAME +CMD /bin/bash ./entrypoint.sh ENV TEST_PHP_EXECUTABLE /usr/bin/php