From 154e4cbed889d9bbcc9dc7d1e8909c670572df67 Mon Sep 17 00:00:00 2001 From: Hadis-Fard Date: Wed, 2 Aug 2017 10:02:41 -0700 Subject: [PATCH] clean up --- .travis.yml | 1 - Dockerfile-msphpsql | 2 -- 2 files changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 198698a2..d210b552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ install: - 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 diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index b96640b2..03da2c9d 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -76,8 +76,6 @@ RUN sed -i -e 's/TARGET_DATABASE/msphpsql_sqlsrv/g' MsSetup.inc RUN sed -i -e 's/TARGET_USERNAME/'"$TEST_PHP_SQL_UID"'/g' MsSetup.inc RUN sed -i -e 's/TARGET_PASSWORD/'"$TEST_PHP_SQL_PWD"'/g' MsSetup.inc -ENV TEST_PHP_EXECUTABLE /usr/bin/php - WORKDIR $PHPSQLDIR RUN chmod +x ./entrypoint.sh CMD /bin/bash ./entrypoint.sh $TEST_PHP_SQL_SERVER $TEST_PHP_SQL_UID $TEST_PHP_SQL_PWD