- remove igbinary from php 7.4 container
* rearrange RUNs in workspace - NODE install to last
This commit is contained in:
@ -16,7 +16,7 @@ WORKSPACE_INSTALL_SSH=true
|
|||||||
WORKSPACE_SSH_PASSPHRAZE=RSfndC66KmuRPRtSXOEe
|
WORKSPACE_SSH_PASSPHRAZE=RSfndC66KmuRPRtSXOEe
|
||||||
WORKSPACE_INSTALL_FSWATCH=false
|
WORKSPACE_INSTALL_FSWATCH=false
|
||||||
WORKSPACE_INSTALL_NODE=true
|
WORKSPACE_INSTALL_NODE=true
|
||||||
WORKSPACE_NODE_VERSION=lts/carbon
|
WORKSPACE_NODE_VERSION=lts/dubnium
|
||||||
WORKSPACE_NPM_REGISTRY=
|
WORKSPACE_NPM_REGISTRY=
|
||||||
WORKSPACE_INSTALL_YARN=true
|
WORKSPACE_INSTALL_YARN=true
|
||||||
WORKSPACE_YARN_VERSION=latest
|
WORKSPACE_YARN_VERSION=latest
|
||||||
|
@ -36,19 +36,6 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /usr/local/e
|
|||||||
sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /usr/local/etc/php/conf.d/xdebug.ini && \
|
sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /usr/local/etc/php/conf.d/xdebug.ini && \
|
||||||
sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /usr/local/etc/php/conf.d/xdebug.ini
|
sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /usr/local/etc/php/conf.d/xdebug.ini
|
||||||
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Redis and igbinary:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
ARG INSTALL_REDIS=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_REDIS} = true ]; then \
|
|
||||||
pecl install igbinary \
|
|
||||||
&& pecl install -a redis \
|
|
||||||
&& docker-php-ext-enable igbinary redis \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Zip:
|
# Zip:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
@ -62,16 +49,6 @@ RUN if [ ${INSTALL_ZIP} = true ]; then \
|
|||||||
;fi
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Pear Mail and Mail_Mime:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
ARG INSTALL_PEAR_MAIL=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_PEAR_MAIL} = true ]; then \
|
|
||||||
pear install Mail && pear install Mail_Mime \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# BZ2 function:
|
# BZ2 function:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
|
@ -164,6 +164,50 @@ RUN echo "" >> ~/.bashrc && \
|
|||||||
echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc
|
echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
# Check PHP version:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
RUN set -xe; php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# MySQL Client:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ARG INSTALL_MYSQL_CLIENT=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get -y install mysql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# ping:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ARG INSTALL_PING=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_PING} = true ]; then \
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get -y install inetutils-ping \
|
||||||
|
;fi
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# PYTHON:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
ARG INSTALL_PYTHON=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_PYTHON} = true ]; then \
|
||||||
|
apt-get -y install python python-pip python-dev build-essential \
|
||||||
|
&& python -m pip install --upgrade pip \
|
||||||
|
&& python -m pip install --upgrade virtualenv \
|
||||||
|
;fi
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
# Crontab
|
# Crontab
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
@ -188,21 +232,6 @@ RUN if [ ${INSTALL_WP_CLI} = true ]; then \
|
|||||||
chmod +x /usr/local/bin/wp \
|
chmod +x /usr/local/bin/wp \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# xDebug:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
USER root
|
|
||||||
|
|
||||||
ARG INSTALL_XDEBUG=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
|
|
||||||
# Load the xdebug extension only with phpunit commands
|
|
||||||
apt-get install -y php${PHP_VERSION}-xdebug && \
|
|
||||||
sed -i 's/^;//g' /etc/php/${PHP_VERSION}/cli/conf.d/20-xdebug.ini && \
|
|
||||||
echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
# ADD for REMOTE debugging
|
# ADD for REMOTE debugging
|
||||||
COPY ./xdebug.ini /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini
|
COPY ./xdebug.ini /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini
|
||||||
|
|
||||||
@ -210,14 +239,6 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${P
|
|||||||
sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini && \
|
sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini && \
|
||||||
sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini
|
sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini
|
||||||
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Additional PHP-extensions:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
RUN pecl install igbinary \
|
|
||||||
&& pecl install -a redis
|
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# ssh:
|
# ssh:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
@ -374,7 +395,7 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
|
|||||||
ENV PATH $PATH:/home/laradock/.yarn/bin
|
ENV PATH $PATH:/home/laradock/.yarn/bin
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# YARN:
|
# GULP:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
ARG INSTALL_GULP=false
|
ARG INSTALL_GULP=false
|
||||||
@ -386,50 +407,6 @@ RUN if [ ${INSTALL_GULP} = true ]; then \
|
|||||||
npm i -g gulp gulp-cli \
|
npm i -g gulp gulp-cli \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# MySQL Client:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
USER root
|
|
||||||
|
|
||||||
ARG INSTALL_MYSQL_CLIENT=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
|
|
||||||
apt-get update -yqq && \
|
|
||||||
apt-get -y install mysql-client \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# ping:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
USER root
|
|
||||||
|
|
||||||
ARG INSTALL_PING=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_PING} = true ]; then \
|
|
||||||
apt-get update -yqq && \
|
|
||||||
apt-get -y install inetutils-ping \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# PYTHON:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
ARG INSTALL_PYTHON=false
|
|
||||||
|
|
||||||
RUN if [ ${INSTALL_PYTHON} = true ]; then \
|
|
||||||
apt-get -y install python python-pip python-dev build-essential \
|
|
||||||
&& python -m pip install --upgrade pip \
|
|
||||||
&& python -m pip install --upgrade virtualenv \
|
|
||||||
;fi
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Check PHP version:
|
|
||||||
###########################################################################
|
|
||||||
|
|
||||||
RUN set -xe; php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
|
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
# Final Touch
|
# Final Touch
|
||||||
|
Reference in New Issue
Block a user