diff --git a/5.6.36-apache/Dockerfile b/5.6.36-apache/Dockerfile index b63396c2..520dec7d 100644 --- a/5.6.36-apache/Dockerfile +++ b/5.6.36-apache/Dockerfile @@ -8,18 +8,27 @@ COPY hostingstart.html /home/site/wwwroot/hostingstart.html RUN a2enmod rewrite expires include deflate # install the PHP extensions we need -RUN apt update \ - && apt install -y --no-install-recommends \ - libpng12-dev \ - libjpeg-dev \ - libpq-dev \ - libmcrypt-dev \ - libldap2-dev \ - libldb-dev \ - libicu-dev \ - libgmp-dev \ - libmagickwand-dev \ - openssh-server vim curl wget tcptraceroute \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + libpng-dev \ + libjpeg-dev \ + libpq-dev \ + libmcrypt-dev \ + libldap2-dev \ + libldb-dev \ + libicu-dev \ + libgmp-dev \ + libmagickwand-dev \ + libc-client-dev \ + libtidy-dev \ + libkrb5-dev \ + libxslt-dev \ + unixodbc-dev \ + openssh-server \ + vim \ + curl \ + wget \ + tcptraceroute \ && chmod 755 /bin/init_container.sh \ && echo "root:Docker!" | chpasswd \ && echo "cd /home" >> /etc/bash.bashrc \ @@ -29,23 +38,52 @@ RUN apt update \ && rm -rf /var/lib/apt/lists/* \ && pecl install imagick-beta \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \ && docker-php-ext-install gd \ - mysqli \ - opcache \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - ldap \ - intl \ - mcrypt \ - gmp \ - zip \ - bcmath \ - mbstring \ - pcntl \ + mysqli \ + opcache \ + pdo \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + ldap \ + intl \ + mcrypt \ + gmp \ + zip \ + bcmath \ + mbstring \ + pcntl \ + calendar \ + exif \ + gettext \ + imap \ + tidy \ + shmop \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + pdo_odbc \ + wddx \ + xmlrpc \ + xsl \ && docker-php-ext-enable imagick +# install odbc php ext +RUN apt-get update \ + && apt-get install unixodbc-dev + +RUN set -x \ + && docker-php-source extract \ + && cd /usr/src/php/ext/odbc \ + && phpize \ + && sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \ + && ./configure --with-unixODBC=shared,/usr \ + && docker-php-ext-install odbc + RUN \ rm -f /var/log/apache2/* \ && rmdir /var/lock/apache2 \ diff --git a/5.6.36-apache/apache2.conf b/5.6.36-apache/apache2.conf index a1869f7a..4f1add6a 100644 --- a/5.6.36-apache/apache2.conf +++ b/5.6.36-apache/apache2.conf @@ -15,6 +15,9 @@ LogLevel warn IncludeOptional mods-enabled/*.load IncludeOptional mods-enabled/*.conf +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf + # ports.conf Listen {PORT} @@ -54,8 +57,5 @@ CustomLog /dev/stdout combined DirectoryIndex disabled DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html -IncludeOptional conf-enabled/*.conf -IncludeOptional sites-enabled/*.conf - ServerTokens Prod ServerSignature Off diff --git a/7.0.30-apache/Dockerfile b/7.0.30-apache/Dockerfile index c75fd165..025e1fbc 100644 --- a/7.0.30-apache/Dockerfile +++ b/7.0.30-apache/Dockerfile @@ -10,16 +10,25 @@ RUN a2enmod rewrite expires include deflate # install the PHP extensions we need RUN apt-get update \ && apt-get install -y --no-install-recommends \ - libpng12-dev \ - libjpeg-dev \ - libpq-dev \ - libmcrypt-dev \ - libldap2-dev \ - libldb-dev \ - libicu-dev \ - libgmp-dev \ - libmagickwand-dev \ - openssh-server vim curl wget tcptraceroute \ + libpng-dev \ + libjpeg-dev \ + libpq-dev \ + libmcrypt-dev \ + libldap2-dev \ + libldb-dev \ + libicu-dev \ + libgmp-dev \ + libmagickwand-dev \ + libc-client-dev \ + libtidy-dev \ + libkrb5-dev \ + libxslt-dev \ + unixodbc-dev \ + openssh-server \ + vim \ + curl \ + wget \ + tcptraceroute \ && chmod 755 /bin/init_container.sh \ && echo "root:Docker!" | chpasswd \ && echo "cd /home" >> /etc/bash.bashrc \ @@ -28,24 +37,56 @@ RUN apt-get update \ && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \ && rm -rf /var/lib/apt/lists/* \ && pecl install imagick-beta \ + && pecl install sqlsrv pdo_sqlsrv \ + && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \ && docker-php-ext-install gd \ - mysqli \ - opcache \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - ldap \ - intl \ - mcrypt \ - gmp \ - zip \ - bcmath \ - mbstring \ - pcntl \ + mysqli \ + opcache \ + pdo \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + ldap \ + intl \ + mcrypt \ + gmp \ + zip \ + bcmath \ + mbstring \ + pcntl \ + calendar \ + exif \ + gettext \ + imap \ + tidy \ + shmop \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + pdo_odbc \ + wddx \ + xmlrpc \ + xsl \ && docker-php-ext-enable imagick +# install odbc php ext +RUN apt-get update \ + && apt-get install unixodbc-dev + +RUN set -x \ + && docker-php-source extract \ + && cd /usr/src/php/ext/odbc \ + && phpize \ + && sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \ + && ./configure --with-unixODBC=shared,/usr \ + && docker-php-ext-install odbc + RUN \ rm -f /var/log/apache2/* \ && rmdir /var/lock/apache2 \ diff --git a/7.0.30-apache/apache2.conf b/7.0.30-apache/apache2.conf index a3a1dbb5..1b70420d 100644 --- a/7.0.30-apache/apache2.conf +++ b/7.0.30-apache/apache2.conf @@ -15,6 +15,9 @@ LogLevel warn IncludeOptional mods-enabled/*.load IncludeOptional mods-enabled/*.conf +IncludeOptional conf-enabled/*.conf +IncludeOptional sites-enabled/*.conf + # ports.conf Listen {PORT} @@ -54,9 +57,6 @@ CustomLog /dev/stdout combined DirectoryIndex disabled DirectoryIndex default.htm default.html index.htm index.html index.php hostingstart.html -IncludeOptional conf-enabled/*.conf -IncludeOptional sites-enabled/*.conf - ServerTokens Prod ServerSignature Off diff --git a/7.2.5-apache/Dockerfile b/7.2.5-apache/Dockerfile index 48006ef2..e4c91eca 100644 --- a/7.2.5-apache/Dockerfile +++ b/7.2.5-apache/Dockerfile @@ -10,16 +10,25 @@ RUN a2enmod rewrite expires include deflate # install the PHP extensions we need RUN apt-get update \ && apt-get install -y --no-install-recommends \ - libpng-dev \ - libjpeg-dev \ - libpq-dev \ - libmcrypt-dev \ - libldap2-dev \ - libldb-dev \ - libicu-dev \ - libgmp-dev \ - libmagickwand-dev \ - openssh-server vim curl wget tcptraceroute \ + libpng-dev \ + libjpeg-dev \ + libpq-dev \ + libmcrypt-dev \ + libldap2-dev \ + libldb-dev \ + libicu-dev \ + libgmp-dev \ + libmagickwand-dev \ + libc-client-dev \ + libtidy-dev \ + libkrb5-dev \ + libxslt-dev \ + unixodbc-dev \ + openssh-server \ + vim \ + curl \ + wget \ + tcptraceroute \ && chmod 755 /bin/init_container.sh \ && echo "root:Docker!" | chpasswd \ && echo "cd /home" >> /etc/bash.bashrc \ @@ -29,24 +38,56 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && pecl install imagick-beta \ && pecl install mcrypt-1.0.1 \ + && pecl install sqlsrv pdo_sqlsrv \ + && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \ && docker-php-ext-install gd \ - mysqli \ - opcache \ - pdo \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - ldap \ - intl \ - gmp \ - zip \ - bcmath \ - mbstring \ - pcntl \ + mysqli \ + opcache \ + pdo \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + ldap \ + intl \ + gmp \ + zip \ + bcmath \ + mbstring \ + pcntl \ + calendar \ + exif \ + gettext \ + imap \ + tidy \ + shmop \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + pdo_odbc \ + wddx \ + xmlrpc \ + xsl \ && docker-php-ext-enable imagick \ && docker-php-ext-enable mcrypt +# install odbc php ext +RUN apt-get update \ + && apt-get install unixodbc-dev + +RUN set -x \ + && docker-php-source extract \ + && cd /usr/src/php/ext/odbc \ + && phpize \ + && sed -ri 's@^ *test +"\$PHP_.*" *= *"no" *&& *PHP_.*=yes *$@#&@g' configure \ + && ./configure --with-unixODBC=shared,/usr \ + && docker-php-ext-install odbc + RUN \ rm -f /var/log/apache2/* \ && rmdir /var/lock/apache2 \