File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -161,6 +161,8 @@ jobs:
161161 - run : sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
162162
163163 - run : bin/dev -b
164+ env :
165+ PHP_VERSION : ${{ matrix.php }}
164166 if : matrix.prepare_container
165167
166168 - run : bin/phpunit --exclude-group=functional
Original file line number Diff line number Diff line change @@ -2,7 +2,12 @@ version: '2'
22
33services :
44 dev :
5- image : enqueue/dev:latest
5+ # when image publishing gets sorted:
6+ # image: enqueue/dev:${PHP_VERSION}
7+ build :
8+ context : docker
9+ args :
10+ - PHP_VERSION=${PHP_VERSION:7.3}
611 depends_on :
712 - rabbitmq
813 - mysql
Original file line number Diff line number Diff line change 1- FROM formapro/nginx-php-fpm:7.3-latest-all-exts
1+ ARG PHP_VERSION=7.3
2+ FROM formapro/nginx-php-fpm:${PHP_VERSION}-latest-all-exts
3+
4+ ARG PHP_VERSION
25
36# # libs
47RUN set -x && \
58 apt-get update && \
6- apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php7.3 -dev php7.3 -redis php7.3 -pgsql git python php-amqp
9+ apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php -dev php${PHP_VERSION} -redis php${PHP_VERSION} -pgsql git python php-amqp
710
811# # librdkafka
912RUN set -x && \
1013 apt-get update && \
11- apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3 -dev make && \
14+ apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php${PHP_VERSION} -dev make && \
1215 mkdir -p $HOME/librdkafka && \
1316 cd $HOME/librdkafka && \
1417 git clone https://github.com/edenhill/librdkafka.git . && \
1518 git checkout v1.0.0 && \
1619 ./configure && make && make install && \
1720 pecl install rdkafka && \
18- echo "extension=rdkafka.so" > /etc/php/7.3 /cli/conf.d/10-rdkafka.ini && \
19- echo "extension=rdkafka.so" > /etc/php/7.3 /fpm/conf.d/10-rdkafka.ini
21+ echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION} /cli/conf.d/10-rdkafka.ini && \
22+ echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION} /fpm/conf.d/10-rdkafka.ini
2023
21- COPY ./php/cli.ini /etc/php/7.3 /cli/conf.d/1-dev_cli.ini
24+ COPY ./php/cli.ini /etc/php/${PHP_VERSION} /cli/conf.d/1-dev_cli.ini
2225COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
2326RUN chmod u+x /usr/local/bin/entrypoint.sh
2427
You can’t perform that action at this time.
0 commit comments