update

2017-10-12 18:54:09 +08:00
parent eefd04dbfc
commit 17ea7b313f
104 changed files with 2759 additions and 13902 deletions
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -45,7 +45,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ARG INSTALL_SOAP=false
 RUN if [ ${INSTALL_SOAP} = true ]; then \
    # Install the soap extension
-    apt-get -y update && \
+    apt-get update -yqq && \
    apt-get -y install libxml2-dev php-soap && \
    docker-php-ext-install soap \
 ;fi
@ -84,11 +84,22 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
 ARG INSTALL_PHPREDIS=false
 RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
    # Install Php Redis Extension
-    pecl install -o -f redis \
+    printf "\n" | pecl install -o -f redis \
    &&  rm -rf /tmp/pear \
    &&  docker-php-ext-enable redis \
 ;fi

+#####################################
+# Swoole EXTENSION FOR PHP 7
+#####################################
+
+ARG INSTALL_SWOOLE=false
+RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+    # Install Php Swoole Extension
+    pecl install swoole \
+    &&  docker-php-ext-enable swoole \
+;fi
+
 #####################################
 # MongoDB:
 #####################################
@ -156,17 +167,17 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
 # PHP Aerospike:
 #####################################

-ARG INSTALL_AEROSPIKE_EXTENSION=false
-ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION}
+ARG INSTALL_AEROSPIKE=false
+ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
 # Copy aerospike configration for remote debugging
 COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
-RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
+RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
    # Install the php aerospike extension
-    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/luciano-jr/aerospike-client-php/archive/master.tar.gz" \
+    curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz" \
    && mkdir -p aerospike-client-php \
    && tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
    && ( \
-        cd aerospike-client-php/src/aerospike \
+        cd aerospike-client-php/src \
        && phpize \
        && ./build.sh \
        && make install \
@ -205,86 +216,6 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
    docker-php-ext-install tokenizer \
 ;fi

-#####################################
-# SQL SERVER:
-#####################################
-
-ARG MSSQL=false
-RUN if [ ${MSSQL} = true ]; then \
-
-    #####################################
-    # Install Depenencies:
-    #####################################
-        apt-get update && \
-        apt-get install -y --force-yes wget apt-transport-https curl freetds-common php5-odbc libsybdb5 freetds-bin unixodbc unixodbc-dev php5-sybase && \
-
-    #####################################
-    #  The following steps were taken from
-    #  Microsoft's github account:
-    #  https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways
-    #####################################
-
-    # Add PHP 7 repository
-    # for Debian jessie
-    # And System upgrade
-        echo "deb http://packages.dotdeb.org jessie all" \
-        | tee /etc/apt/sources.list.d/dotdeb.list \
-        && wget -qO- https://www.dotdeb.org/dotdeb.gpg \
-        | apt-key add - \
-        && apt-get update \
-        && apt-get upgrade -qq && \
-
-    # Install UnixODBC
-    # Compile odbc_config as it is not part of unixodbc package
-        apt-get install -y whiptail \
-        unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \
-        && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \
-        && cd unixodbc-*/ \
-        && dpkg-buildpackage -uc -us -B -d \
-        && cp -v ./exe/odbc_config /usr/local/bin/ && \
-
-    # Fake uname for install.sh
-        printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \
-        | tee /usr/local/bin/uname \
-        && chmod +x /usr/local/bin/uname && \
-
-    # Microsoft ODBC Driver 13 for Linux
-    # Note: There's a copy of this tar on my hubiC
-        wget -nv -O msodbcsql-13.0.0.0.tar.gz \
-        "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \
-        && tar -xf msodbcsql-13.0.0.0.tar.gz \
-        && cd msodbcsql-*/ \
-        && ldd lib64/libmsodbcsql-13.0.so.0.0 \
-        && ./install.sh install --accept-license \
-        && ls -l /opt/microsoft/msodbcsql/ \
-        && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" \
-
-    #####################################
-    # Install pdo_dblib
-    #####################################
-
-    && docker-php-ext-install pdo \
-    && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \
-    && docker-php-ext-install pdo_dblib \
-    && docker-php-ext-enable pdo_dblib && \
-
-    #####################################
-    # Install sqlsrv y pdo_sqlsrv
-    # extensions:
-    #####################################
-
-    pecl install sqlsrv-4.0.6 && \
-    pecl install pdo_sqlsrv-4.0.6 && \
-
-    #####################################
-    # Set locales for the container
-    #####################################
-
-    apt-get install -y locales \
-    && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
-    && locale-gen \
-;fi
-
 #####################################
 # Human Language and Character Encoding Support:
 #####################################
@ -292,8 +223,8 @@ RUN if [ ${MSSQL} = true ]; then \
 ARG INSTALL_INTL=false
 RUN if [ ${INSTALL_INTL} = true ]; then \
    # Install intl and requirements
-    apt-get -y update \
-    && apt-get install -y zlib1g-dev libicu-dev g++ && \
+    apt-get update -yqq && \
+    apt-get install -y zlib1g-dev libicu-dev g++ && \
    docker-php-ext-configure intl && \
    docker-php-ext-install intl \
 ;fi
@ -306,20 +237,83 @@ ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ ${INSTALL_GHOSTSCRIPT} = true ]; then \
    # Install the ghostscript extension
    # for PDF editing
-    apt-get -y update \
+    apt-get update -yqq \
    && apt-get install -y \
    poppler-utils \
    ghostscript \
 ;fi

+#####################################
+# LDAP:
+#####################################
+
+ARG INSTALL_LDAP=false
+RUN if [ ${INSTALL_LDAP} = true ]; then \
+    apt-get update -yqq && \
+    apt-get install -y libldap2-dev && \
+    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
+    docker-php-ext-install ldap \
+;fi
+
+#####################################
+# SQL SERVER:
+#####################################
+
+ARG INSTALL_MSSQL=false
+ENV INSTALL_MSSQL ${INSTALL_MSSQL}
+RUN if [ ${INSTALL_MSSQL} = true ]; then \
+    #####################################
+    # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
+    #####################################
+    # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
+    apt-get update -yqq \
+        && apt-get install -y apt-transport-https \
+        && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
+        && curl https://packages.microsoft.com/config/debian/8/prod.list > /etc/apt/sources.list.d/mssql-release.list \
+        && apt-get update -yqq \
+
+    # Install Dependencies
+        && ACCEPT_EULA=Y apt-get install -y unixodbc unixodbc-dev libgss3 odbcinst msodbcsql locales \
+        && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+        && locale-gen \
+
+    # Install pdo_sqlsrv and sqlsrv from PECL. Replace pdo_sqlsrv-4.1.8preview with preferred version.
+        && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \
+        && docker-php-ext-enable pdo_sqlsrv sqlsrv \
+;fi
+
+#####################################
+# Image optimizers:
+#####################################
+USER root
+ARG INSTALL_IMAGE_OPTIMIZERS=false
+ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
+RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
+    apt-get update -yqq && \
+    apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
+;fi
+
+#####################################
+# ImageMagick:
+#####################################
+USER root
+ARG INSTALL_IMAGEMAGICK=false
+ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
+RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
+    apt-get update -y && \
+    apt-get install -y libmagickwand-dev imagemagick && \ 
+    pecl install imagick && \
+    docker-php-ext-enable imagick \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch
 #--------------------------------------------------------------------------
 #

-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+ADD ./laravel.ini /usr/local/etc/php/conf.d/
+ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/

 #RUN rm -r /var/lib/apt/lists/*