Skip to content

Commit eda7728

Browse files
authored
install xdebug 2.9.8 (yiisoft#105)
* install xdebug 2.9.8 * add arg for xdebug version
1 parent 7a3cbd9 commit eda7728

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.env-dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
## Built image name
77
PHP_IMAGE_NAME=local/yiisoftware/yii2-php
88
PHP_IMAGE_VERSION_SUFFIX=
9+
PECL_XDEBUG_INSTALL_SUFFIX=
910

1011
## Apache
1112
COMPOSE_PROJECT_NAME=yii2apache

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ services: docker
33

44
env:
55
- PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
6-
- PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
7-
- PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
6+
- PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2
7+
- PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8
88
- PHP_BASE_IMAGE_VERSION=7.2-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
99
- PHP_BASE_IMAGE_VERSION=7.3-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
1010
- PHP_BASE_IMAGE_VERSION=7.4-fpm DOCKERFILE_FLAVOUR=debian
1111
- PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
12-
- PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
13-
- PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
12+
- PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2
13+
- PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8
1414
- PHP_BASE_IMAGE_VERSION=7.2-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
1515
- PHP_BASE_IMAGE_VERSION=7.3-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
1616
- PHP_BASE_IMAGE_VERSION=7.4-apache
@@ -19,12 +19,12 @@ matrix:
1919
allow_failures:
2020
# Deprecated PHP versions
2121
- env: PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
22-
- env: PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
23-
- env: PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
22+
- env: PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2
23+
- env: PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8
2424
- env: PHP_BASE_IMAGE_VERSION=7.2-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
2525
- env: PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
26-
- env: PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
27-
- env: PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
26+
- env: PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2
27+
- env: PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8
2828
- env: PHP_BASE_IMAGE_VERSION=7.2-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
2929

3030
before_install:

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
args:
99
- PHP_BASE_IMAGE_VERSION
1010
- X_LEGACY_GD_LIB
11+
- PECL_XDEBUG_INSTALL_SUFFIX
1112
image: ${PHP_IMAGE_NAME}:${PHP_BASE_IMAGE_VERSION}${PHP_IMAGE_VERSION_SUFFIX}
1213
environment:
1314
- GITHUB_API_TOKEN=${GITHUB_API_TOKEN}

php/Dockerfile-debian

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ RUN if [ $X_LEGACY_GD_LIB = 1 ]; then \
6767

6868
# Install PECL extensions
6969
# see http://stackoverflow.com/a/8154466/291573) for usage of `printf`
70+
ARG PECL_XDEBUG_INSTALL_SUFFIX
7071
RUN printf "\n" | pecl install \
7172
imagick \
72-
xdebug \
73+
xdebug${PECL_XDEBUG_INSTALL_SUFFIX} \
7374
mongodb && \
7475
docker-php-ext-enable \
7576
imagick \

0 commit comments

Comments
 (0)