* movements in workspace Dockerfile
- remove aerospike unusued config
This commit is contained in:
@ -17,7 +17,7 @@ ARG PHP_VERSION
|
|||||||
# FROM laradock/workspace:2.2-${PHP_VERSION}
|
# FROM laradock/workspace:2.2-${PHP_VERSION}
|
||||||
FROM letsdockerize/laradock-workspace:2.4-${PHP_VERSION}
|
FROM letsdockerize/laradock-workspace:2.4-${PHP_VERSION}
|
||||||
|
|
||||||
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
|
LABEL maintainer="WP Studio <info@wpstudio.ru>"
|
||||||
|
|
||||||
# Set Environment Variables
|
# Set Environment Variables
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
@ -108,6 +108,19 @@ RUN echo "" >> ~/.bashrc && \
|
|||||||
echo "" >> ~/.bashrc
|
echo "" >> ~/.bashrc
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
# 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
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
# Composer:
|
# Composer:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
@ -241,6 +254,21 @@ 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
|
||||||
|
|
||||||
@ -248,17 +276,29 @@ 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:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
RUN pecl install igbinary \
|
||||||
|
&& pecl install -a redis
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# ssh:
|
# ssh:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
ARG INSTALL_SSH=false
|
ARG INSTALL_SSH=false
|
||||||
ENV INSTALL_SSH ${INSTALL_SSH}
|
ENV INSTALL_SSH ${INSTALL_SSH}
|
||||||
|
|
||||||
ARG SSH_PASSPHRAZE=12345
|
ARG SSH_PASSPHRAZE=
|
||||||
ENV SSH_PASSPHRAZE ${SSH_PASSPHRAZE}
|
ENV SSH_PASSPHRAZE ${SSH_PASSPHRAZE}
|
||||||
|
|
||||||
RUN ssh-keygen -f /tmp/id_rsa -N ${SSH_PASSPHRAZE}
|
RUN ssh-keygen -f /tmp/id_rsa -N '${SSH_PASSPHRAZE}'
|
||||||
|
|
||||||
RUN if [ ${INSTALL_SSH} = true ]; then \
|
RUN if [ ${INSTALL_SSH} = true ]; then \
|
||||||
rm -f /etc/service/sshd/down && \
|
rm -f /etc/service/sshd/down && \
|
||||||
@ -276,6 +316,8 @@ RUN if [ ${INSTALL_SSH} = true ]; then \
|
|||||||
# fswatch
|
# fswatch
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
ARG INSTALL_FSWATCH=false
|
ARG INSTALL_FSWATCH=false
|
||||||
|
|
||||||
RUN if [ ${INSTALL_FSWATCH} = true ]; then \
|
RUN if [ ${INSTALL_FSWATCH} = true ]; then \
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
extension=aerospike.so
|
|
||||||
aerospike.udf.lua_system_path=/usr/local/aerospike/lua
|
|
||||||
aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua
|
|
Reference in New Issue
Block a user