From 764e4845997335d8e7dfffdc370dbc9c15c6e61c Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sun, 29 Jul 2018 12:00:13 +0800 Subject: [PATCH] Env variable conflict (#1734) * php-fpm and workspace arg var rename: PHP_VERSION to LARADOCK_PHP_VERSION. * travis-ci skip phpbdg --- docker-compose.yml | 4 +-- php-fpm/Dockerfile | 13 ++++---- travis-build.sh | 1 + workspace/Dockerfile | 74 +++++++++++++++++++------------------------- 4 files changed, 40 insertions(+), 52 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d9b2112..f865989 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: build: context: ./workspace args: - - PHP_VERSION=${PHP_VERSION} + - LARADOCK_PHP_VERSION=${PHP_VERSION} - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION} - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG} - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG} @@ -115,7 +115,7 @@ services: build: context: ./php-fpm args: - - PHP_VERSION=${PHP_VERSION} + - LARADOCK_PHP_VERSION=${PHP_VERSION} - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG} - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG} - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 5dc801f..45b91d2 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -12,12 +12,14 @@ # Note: Base Image name format {image-tag}-{php-version} # -ARG PHP_VERSION=${PHP_VERSION} +ARG LARADOCK_PHP_VERSION -FROM laradock/php-fpm:2.2-${PHP_VERSION} +FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " +ARG LARADOCK_PHP_VERSION + # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -114,11 +116,10 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /usr/local/e ########################################################################### ARG INSTALL_PHPDBG=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_PHPDBG} = true ]; then \ # Load the xdebug extension only with phpunit commands - apt-get install -y --force-yes php${PHP_VERSION}-phpdbg \ + apt-get install -y --force-yes php${LARADOCK_PHP_VERSION}-phpdbg \ ;fi ########################################################################### @@ -488,9 +489,7 @@ RUN if [ ${INSTALL_CALENDAR} = true ]; then \ # Check PHP version: ########################################################################### -ARG PHP_VERSION=${PHP_VERSION} - -RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}." +RUN php -v | head -n 1 | grep -q "PHP ${LARADOCK_PHP_VERSION}." # #-------------------------------------------------------------------------- diff --git a/travis-build.sh b/travis-build.sh index c72f51d..d6aec97 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -14,6 +14,7 @@ if [ -n "${PHP_VERSION}" ]; then cp env-example .env sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env sed -i -- 's/=false/=true/g' .env + sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env cat .env docker-compose build ${BUILD_SERVICE} docker images diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 1921bac..60c6cdb 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -12,12 +12,14 @@ # Note: Base Image name format {image-tag}-{php-version} # -ARG PHP_VERSION=${PHP_VERSION} +ARG LARADOCK_PHP_VERSION -FROM laradock/workspace:2.2-${PHP_VERSION} +FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " +ARG LARADOCK_PHP_VERSION + # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -179,11 +181,10 @@ RUN if [ ${INSTALL_DRUSH} = true ]; then \ USER root ARG INSTALL_SOAP=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install the PHP SOAP extension - apt-get -y install libxml2-dev php${PHP_VERSION}-soap \ + apt-get -y install libxml2-dev php${LARADOCK_PHP_VERSION}-soap \ ;fi ########################################################################### @@ -191,11 +192,10 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \ ########################################################################### ARG INSTALL_LDAP=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_LDAP} = true ]; then \ apt-get install -y libldap2-dev && \ - apt-get install -y php${PHP_VERSION}-ldap \ + apt-get install -y php${LARADOCK_PHP_VERSION}-ldap \ ;fi ########################################################################### @@ -203,10 +203,9 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ ########################################################################### ARG INSTALL_IMAP=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_IMAP} = true ]; then \ - apt-get install -y php${PHP_VERSION}-imap \ + apt-get install -y php${LARADOCK_PHP_VERSION}-imap \ ;fi ########################################################################### @@ -229,21 +228,20 @@ RUN if [ ${INSTALL_SUBVERSION} = true ]; then \ USER root ARG INSTALL_XDEBUG=false -ARG PHP_VERSION=${PHP_VERSION} 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 && \ + apt-get install -y php${LARADOCK_PHP_VERSION}-xdebug && \ + sed -i 's/^;//g' /etc/php/${LARADOCK_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 -COPY ./xdebug.ini /etc/php/${PHP_VERSION}/cli/conf.d/xdebug.ini +COPY ./xdebug.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini -RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=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 +RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini ########################################################################### # Phpdbg: @@ -252,11 +250,10 @@ RUN sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${P USER root ARG INSTALL_PHPDBG=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_PHPDBG} = true ]; then \ # Load the xdebug extension only with phpunit commands - apt-get install -y --force-yes php${PHP_VERSION}-phpdbg \ + apt-get install -y --force-yes php${LARADOCK_PHP_VERSION}-phpdbg \ ;fi ########################################################################### @@ -302,18 +299,17 @@ RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ ########################################################################### ARG INSTALL_MONGO=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install mongo && \ - echo "extension=mongo.so" >> /etc/php/${PHP_VERSION}/mods-available/mongo.ini && \ - ln -s /etc/php/${PHP_VERSION}/mods-available/mongo.ini /etc/php/${PHP_VERSION}/cli/conf.d/30-mongo.ini \ + echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini && \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini \ ;fi && \ pecl install mongodb && \ - echo "extension=mongodb.so" >> /etc/php/${PHP_VERSION}/mods-available/mongodb.ini && \ - ln -s /etc/php/${PHP_VERSION}/mods-available/mongodb.ini /etc/php/${PHP_VERSION}/cli/conf.d/30-mongodb.ini \ + echo "extension=mongodb.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini && \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini \ ;fi ########################################################################### @@ -321,13 +317,12 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ ########################################################################### ARG INSTALL_AMQP=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_AMQP} = true ]; then \ apt-get install librabbitmq-dev -y && \ pecl -q install amqp && \ - echo "extension=amqp.so" >> /etc/php/${PHP_VERSION}/mods-available/amqp.ini && \ - ln -s /etc/php/${PHP_VERSION}/mods-available/amqp.ini /etc/php/${PHP_VERSION}/cli/conf.d/30-amqp.ini \ + echo "extension=amqp.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/amqp.ini && \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/amqp.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-amqp.ini \ ;fi ########################################################################### @@ -335,12 +330,11 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \ ########################################################################### ARG INSTALL_PHPREDIS=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ # Install Php Redis extension printf "\n" | pecl -q install -o -f redis && \ - echo "extension=redis.so" >> /etc/php/${PHP_VERSION}/mods-available/redis.ini && \ + echo "extension=redis.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/redis.ini && \ phpenmod redis \ ;fi @@ -349,7 +343,6 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ ########################################################################### ARG INSTALL_SWOOLE=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension @@ -362,8 +355,8 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \ pecl install swoole; \ fi \ fi && \ - echo "extension=swoole.so" >> /etc/php/${PHP_VERSION}/mods-available/swoole.ini && \ - ln -s /etc/php/${PHP_VERSION}/mods-available/swoole.ini /etc/php/${PHP_VERSION}/cli/conf.d/20-swoole.ini \ + echo "extension=swoole.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini && \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini \ ;fi ########################################################################### @@ -491,7 +484,6 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ USER root ARG INSTALL_AEROSPIKE=false -ARG PHP_VERSION=${PHP_VERSION} ARG AEROSPIKE_PHP_REPOSITORY RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ @@ -508,9 +500,9 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ - && echo 'extension=aerospike.so' >> /etc/php/${PHP_VERSION}/cli/conf.d/aerospike.ini \ - && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${PHP_VERSION}/cli/conf.d/aerospike.ini \ - && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ ;fi ########################################################################### @@ -520,15 +512,14 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ USER root ARG INSTALL_V8JS=false -ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_V8JS} = true ]; then \ # Install the php V8JS extension add-apt-repository -y ppa:pinepain/libv8-archived \ && apt-get update -yqq \ - && apt-get install -y php${PHP_VERSION}-xml php${PHP_VERSION}-dev php-pear libv8-5.4 \ + && apt-get install -y php${LARADOCK_PHP_VERSION}-xml php${LARADOCK_PHP_VERSION}-dev php-pear libv8-5.4 \ && pecl install v8js \ - && echo "extension=v8js.so" >> /etc/php/${PHP_VERSION}/cli/php.ini \ + && echo "extension=v8js.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \ ;fi ########################################################################### @@ -626,7 +617,6 @@ RUN if [ ${INSTALL_LINUXBREW} = true ]; then \ ########################################################################### ARG INSTALL_MSSQL=false -ARG PHP_VERSION=${PHP_VERSION} RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ @@ -647,8 +637,8 @@ RUN set -eux; if [ ${INSTALL_MSSQL} = true ]; then \ echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ locale-gen && \ pecl install sqlsrv pdo_sqlsrv && \ - echo "extension=sqlsrv.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ - echo "extension=pdo_sqlsrv.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-pdo_sqlsrv.ini \ + echo "extension=sqlsrv.so" > /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ + echo "extension=pdo_sqlsrv.so" > /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-pdo_sqlsrv.ini \ && php -m | grep -q 'sqlsrv' \ && php -m | grep -q 'pdo_sqlsrv' \ ;fi \ @@ -801,9 +791,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \ # Check PHP version: ########################################################################### -ARG PHP_VERSION=${PHP_VERSION} - -RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}." +RUN php -v | head -n 1 | grep -q "PHP ${LARADOCK_PHP_VERSION}." # #--------------------------------------------------------------------------