Merge pull request #1117 from masterjus/fix-php_redis-installation
Fix Php Redis extension installation
This commit is contained in:
commit
8485add87a
|
@ -19,6 +19,7 @@ services:
|
||||||
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
||||||
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
|
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
|
||||||
- INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
|
- INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
|
||||||
|
- INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
|
||||||
- INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
|
- INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
|
||||||
- INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
|
- INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
|
||||||
- INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
|
- INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
|
||||||
|
|
|
@ -32,6 +32,7 @@ PHP_INTERPRETER=php-fpm
|
||||||
WORKSPACE_INSTALL_XDEBUG=false
|
WORKSPACE_INSTALL_XDEBUG=false
|
||||||
WORKSPACE_INSTALL_SOAP=false
|
WORKSPACE_INSTALL_SOAP=false
|
||||||
WORKSPACE_INSTALL_MONGO=false
|
WORKSPACE_INSTALL_MONGO=false
|
||||||
|
WORKSPACE_INSTALL_PHPREDIS=false
|
||||||
WORKSPACE_INSTALL_MSSQL=false
|
WORKSPACE_INSTALL_MSSQL=false
|
||||||
WORKSPACE_INSTALL_NODE=false
|
WORKSPACE_INSTALL_NODE=false
|
||||||
WORKSPACE_INSTALL_YARN=false
|
WORKSPACE_INSTALL_YARN=false
|
||||||
|
|
|
@ -87,7 +87,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
|
||||||
ARG INSTALL_PHPREDIS=false
|
ARG INSTALL_PHPREDIS=false
|
||||||
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
# Install Php Redis Extension
|
# Install Php Redis Extension
|
||||||
pecl install -o -f redis \
|
printf "\n" | pecl install -o -f redis \
|
||||||
&& rm -rf /tmp/pear \
|
&& rm -rf /tmp/pear \
|
||||||
&& docker-php-ext-enable redis \
|
&& docker-php-ext-enable redis \
|
||||||
;fi
|
;fi
|
||||||
|
|
|
@ -84,7 +84,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
|
||||||
ARG INSTALL_PHPREDIS=false
|
ARG INSTALL_PHPREDIS=false
|
||||||
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
# Install Php Redis Extension
|
# Install Php Redis Extension
|
||||||
pecl install -o -f redis \
|
printf "\n" | pecl install -o -f redis \
|
||||||
&& rm -rf /tmp/pear \
|
&& rm -rf /tmp/pear \
|
||||||
&& docker-php-ext-enable redis \
|
&& docker-php-ext-enable redis \
|
||||||
;fi
|
;fi
|
||||||
|
|
|
@ -78,13 +78,13 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# PHP REDIS EXTENSION FOR PHP 7
|
# PHP REDIS EXTENSION FOR PHP 7.0
|
||||||
#####################################
|
#####################################
|
||||||
|
|
||||||
ARG INSTALL_PHPREDIS=false
|
ARG INSTALL_PHPREDIS=false
|
||||||
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
# Install Php Redis Extension
|
# Install Php Redis Extension
|
||||||
pecl install -o -f redis \
|
printf "\n" | pecl install -o -f redis \
|
||||||
&& rm -rf /tmp/pear \
|
&& rm -rf /tmp/pear \
|
||||||
&& docker-php-ext-enable redis \
|
&& docker-php-ext-enable redis \
|
||||||
;fi
|
;fi
|
||||||
|
|
|
@ -194,6 +194,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
|
||||||
ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \
|
ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# PHP REDIS EXTENSION FOR PHP 5.6
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG INSTALL_PHPREDIS=false
|
||||||
|
ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS}
|
||||||
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
|
# Install Php Redis extension
|
||||||
|
printf "\n" | pecl -q install -o -f redis && \
|
||||||
|
echo "extension=redis.so" >> /etc/php/5.6/mods-available/redis.ini && \
|
||||||
|
phpenmod redis \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Drush:
|
# Drush:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
|
@ -194,6 +194,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
|
||||||
ln -s /etc/php/7.0/mods-available/mongodb.ini /etc/php/7.0/cli/conf.d/30-mongodb.ini \
|
ln -s /etc/php/7.0/mods-available/mongodb.ini /etc/php/7.0/cli/conf.d/30-mongodb.ini \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# PHP REDIS EXTENSION FOR PHP 7
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG INSTALL_PHPREDIS=false
|
||||||
|
ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS}
|
||||||
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
|
# Install Php Redis extension
|
||||||
|
printf "\n" | pecl -q install -o -f redis && \
|
||||||
|
echo "extension=redis.so" >> /etc/php/7.0/mods-available/redis.ini && \
|
||||||
|
phpenmod redis \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Drush:
|
# Drush:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
|
@ -186,11 +186,24 @@ ARG INSTALL_MONGO=false
|
||||||
ENV INSTALL_MONGO ${INSTALL_MONGO}
|
ENV INSTALL_MONGO ${INSTALL_MONGO}
|
||||||
RUN if [ ${INSTALL_MONGO} = true ]; then \
|
RUN if [ ${INSTALL_MONGO} = true ]; then \
|
||||||
# Install the mongodb extension
|
# Install the mongodb extension
|
||||||
pecl install mongodb && \
|
pecl -q install mongodb && \
|
||||||
echo "extension=mongodb.so" >> /etc/php/7.1/mods-available/mongodb.ini && \
|
echo "extension=mongodb.so" >> /etc/php/7.1/mods-available/mongodb.ini && \
|
||||||
ln -s /etc/php/7.1/mods-available/mongodb.ini /etc/php/7.1/cli/conf.d/30-mongodb.ini \
|
ln -s /etc/php/7.1/mods-available/mongodb.ini /etc/php/7.1/cli/conf.d/30-mongodb.ini \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# PHP REDIS EXTENSION FOR PHP 7.1
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG INSTALL_PHPREDIS=false
|
||||||
|
ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS}
|
||||||
|
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
|
||||||
|
# Install Php Redis extension
|
||||||
|
printf "\n" | pecl -q install -o -f redis && \
|
||||||
|
echo "extension=redis.so" >> /etc/php/7.1/mods-available/redis.ini && \
|
||||||
|
phpenmod redis \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Drush:
|
# Drush:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
Loading…
Reference in New Issue