resolved conflicts in travis and docker
This commit is contained in:
parent
0441af291c
commit
3800a2c0ab
|
@ -37,9 +37,10 @@ script:
|
||||||
- docker logs client
|
- docker logs client
|
||||||
- travis_retry docker exec client python ./test/functional/setup/setup_dbs.py -dbname $SQLSRV_DBNAME
|
- travis_retry docker exec client python ./test/functional/setup/setup_dbs.py -dbname $SQLSRV_DBNAME
|
||||||
- travis_retry docker exec client python ./test/functional/setup/setup_dbs.py -dbname $PDOSQLSRV_DBNAME
|
- travis_retry docker exec client python ./test/functional/setup/setup_dbs.py -dbname $PDOSQLSRV_DBNAME
|
||||||
|
- docker exec client cp ./source/shared/msodbcsql.h ./test/functional/setup/
|
||||||
- travis_retry docker exec client python ./test/functional/setup/build_ksp.py
|
- travis_retry docker exec client python ./test/functional/setup/build_ksp.py
|
||||||
- travis_retry docker exec client cp ./test/functional/setup/myKSP.so ./test/functional/sqlsrv/
|
- docker exec client cp ./test/functional/setup/myKSP.so ./test/functional/sqlsrv/
|
||||||
- travis_retry docker exec client cp ./test/functional/setup/myKSP.so ./test/functional/pdo_sqlsrv/
|
- docker exec client cp ./test/functional/setup/myKSP.so ./test/functional/pdo_sqlsrv/
|
||||||
- travis_retry docker exec client python ./test/functional/setup/run_ksp.py -server $TEST_PHP_SQL_SERVER -dbname $SQLSRV_DBNAME -uid $TEST_PHP_SQL_UID -pwd $TEST_PHP_SQL_PWD
|
- travis_retry docker exec client python ./test/functional/setup/run_ksp.py -server $TEST_PHP_SQL_SERVER -dbname $SQLSRV_DBNAME -uid $TEST_PHP_SQL_UID -pwd $TEST_PHP_SQL_PWD
|
||||||
- travis_retry docker exec client python ./test/functional/setup/run_ksp.py -server $TEST_PHP_SQL_SERVER -dbname $PDOSQLSRV_DBNAME -uid $TEST_PHP_SQL_UID -pwd $TEST_PHP_SQL_PWD
|
- travis_retry docker exec client python ./test/functional/setup/run_ksp.py -server $TEST_PHP_SQL_SERVER -dbname $PDOSQLSRV_DBNAME -uid $TEST_PHP_SQL_UID -pwd $TEST_PHP_SQL_PWD
|
||||||
- travis_retry docker exec client php ./source/pdo_sqlsrv/run-tests.php ./test/functional/pdo_sqlsrv/*.phpt
|
- travis_retry docker exec client php ./source/pdo_sqlsrv/run-tests.php ./test/functional/pdo_sqlsrv/*.phpt
|
||||||
|
|
|
@ -44,20 +44,9 @@ RUN pip install --upgrade pip && pip install cpp-coveralls
|
||||||
|
|
||||||
#Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
|
#Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
|
||||||
#One option is to get source from zip file of repository.
|
#One option is to get source from zip file of repository.
|
||||||
<<<<<<< HEAD
|
|
||||||
#another option is to copy source to build directory on image
|
#another option is to copy source to build directory on image
|
||||||
RUN mkdir -p $PHPSQLDIR
|
RUN mkdir -p $PHPSQLDIR
|
||||||
COPY . $PHPSQLDIR
|
COPY . $PHPSQLDIR
|
||||||
=======
|
|
||||||
|
|
||||||
# another option is to copy source to build directory on image
|
|
||||||
RUN mkdir -p $PHPSQLDIR
|
|
||||||
COPY . $PHPSQLDIR
|
|
||||||
|
|
||||||
# copy odbc header file to setup
|
|
||||||
COPY $PHPSQLDIR/source/shared/msodbcsql.h $PHPSQLDIR/test/functional/setup
|
|
||||||
|
|
||||||
>>>>>>> 328286b... added checks for server version in the tests
|
|
||||||
WORKDIR $PHPSQLDIR/source/
|
WORKDIR $PHPSQLDIR/source/
|
||||||
|
|
||||||
RUN chmod +x ./packagize.sh
|
RUN chmod +x ./packagize.sh
|
||||||
|
@ -89,8 +78,5 @@ WORKDIR $PHPSQLDIR
|
||||||
RUN chmod +x ./entrypoint.sh
|
RUN chmod +x ./entrypoint.sh
|
||||||
CMD /bin/bash ./entrypoint.sh
|
CMD /bin/bash ./entrypoint.sh
|
||||||
|
|
||||||
# copy odbc header file to setup
|
|
||||||
COPY $PHPSQLDIR/source/shared/msodbcsql.h $PHPSQLDIR/test/functional/setup
|
|
||||||
|
|
||||||
ENV REPORT_EXIT_STATUS 1
|
ENV REPORT_EXIT_STATUS 1
|
||||||
ENV TEST_PHP_EXECUTABLE /usr/bin/php
|
ENV TEST_PHP_EXECUTABLE /usr/bin/php
|
Loading…
Reference in a new issue