Skip to content

Commit ae50c2a

Browse files
author
Eugene Leonovich
committed
Update php ext installations
1 parent 33a57c9 commit ae50c2a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
install:
1414
- docker build -t tarantool/tarantool github.com/tarantool/tarantool-docker#:debian
15-
- ./dockerfile.sh | docker build -t queue -
15+
- ./dockerfile.sh | tee /dev/tty | docker build -t queue -
1616

1717
script:
1818
- docker run -d --name tarantool -v $(pwd):/queue tarantool/tarantool /queue/tests/Integration/queues.lua

dockerfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ RUN_CMDS=''
88

99
if [[ $PHP_RUNTIME == php* ]]; then
1010
RUN_CMDS="$RUN_CMDS && \\\\\n git clone https://github.com/tarantool/tarantool-php.git /usr/src/php/ext/tarantool"
11-
RUN_CMDS="$RUN_CMDS && \\\\\n docker-php-ext-install zip tarantool"
11+
RUN_CMDS="$RUN_CMDS && \\\\\n echo tarantool >> /usr/src/php-available-exts && docker-php-ext-install zip tarantool"
1212
fi
1313

1414
if [[ $PHPUNIT_OPTS =~ (^|[[:space:]])--coverage-[[:alpha:]] ]]; then
1515
RUN_CMDS="$RUN_CMDS && \\\\\n git clone https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug"
16-
RUN_CMDS="$RUN_CMDS && \\\\\n docker-php-ext-install xdebug"
16+
RUN_CMDS="$RUN_CMDS && \\\\\n echo xdebug >> /usr/src/php-available-exts && docker-php-ext-install xdebug"
1717
fi
1818

1919
echo -e "

0 commit comments

Comments
 (0)