diff --git a/.travis.yml b/.travis.yml index feaf6731..dcddf8f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ before_install: - docker pull microsoft/mssql-server-linux install: - - docker build --build-arg PHPSQLDIR=$PHPSQLDIR -t msphpsql-dev -f Dockerfile-msphpsql . - 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 diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index 377665f9..262120da 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -80,11 +80,11 @@ 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" +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 +RUN python ./setup_dbs.py -dbname $SQLSRV_DBNAME +RUN python ./setup_dbs.py -dbname $PDOSQLSRV_DBNAME ENV TEST_PHP_EXECUTABLE /usr/bin/php