Merge pull request #7 from jalxes/patch-1

Update Image

Author: Móveis Simonetti

Dockerfile

@@ -12,20 +12,20 @@ ENV SESSION_HANDLER_NAME=""
 ENV SESSION_HANDLER_PATH=""
 
 RUN apt-get update && apt-get install -y wget vim supervisor zip libfreetype6-dev libjpeg62-turbo-dev \
-       libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
-       libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev \
-       sudo
+    libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
+    libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev \
+    sudo
 
 RUN a2enmod rewrite
 
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && docker-php-ext-configure hash --with-mhash \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install -j$(nproc) iconv bcmath mcrypt \
-        gd pdo_mysql calendar curl exif ftp gettext \
-        hash xsl ldap intl imap pdo_sqlite mbstring \
-        mcrypt pcntl readline shmop soap sockets wddx zip
+    && docker-php-ext-install -j$(nproc) bcmath \
+    gd pdo_mysql calendar exif gettext \
+    hash xsl ldap intl imap \
+    pcntl shmop soap sockets wddx zip
 
 RUN pecl install redis \
     && echo "extension=redis.so" >> /usr/local/etc/php/conf.d/redis.ini
@@ -36,8 +36,8 @@ RUN echo "---> Adding Support for NewRelic" && \
     wget -r -l1 -nd -A"linux.tar.gz" https://download.newrelic.com/php_agent/release/ && \
     gzip -dc newrelic*.tar.gz | tar xf - && \
     cd newrelic-php5* && \
-    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20151012/newrelic.so && \
-    cp ./agent/x64/newrelic-20151012.so /usr/local/lib/php/extensions/no-debug-non-zts-20151012/newrelic.so && \
+    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20170718/newrelic.so && \
+    cp ./agent/x64/newrelic-20170718.so /usr/local/lib/php/extensions/no-debug-non-zts-20170718/newrelic.so && \
     cp ./daemon/newrelic-daemon.x64 /usr/bin/newrelic-daemon && \
     cp ./scripts/newrelic.ini.template /scripts/newrelic.ini && \
     mkdir /var/log/newrelic &&  \

apache-run.sh

@@ -1,13 +1,27 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [[ $XDEBUG_ENABLED == true ]]; then
-	docker-php-ext-enable xdebug
-	echo "xdebug.var_display_max_depth=5" >> /usr/local/etc/php/conf.d/xdebug.ini
+    echo "zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+    echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
 fi
 
-usermod -u 1000 www-data \
-    && cd /var/www/html && composer install && rm -rf var/cache/* var/logs/* \
-    && chown -R www-data:www-data /var/www/html/var/cache && chmod 777 /var/www/html/var/cache \
-    && chown -R www-data:www-data /var/www/html/var/logs && chmod 777 /var/www/html/var/logs \
-    && chown -R www-data:www-data /var/www/html/var/sessions && chmod 777 /var/www/html/var/sessions \
-    && apache2-foreground
+if [[ $NR_ENABLED == true ]]; then
+    sudo sed -i -e "s/"REPLACE_WITH_REAL_KEY"/$NR_LICENSE_KEY/g" /scripts/newrelic.ini
+    sudo sed -i -e "s/PHP Application/$NR_APP_NAME/g" /scripts/newrelic.ini
+    sudo cp /scripts/newrelic.ini /usr/local/etc/php/conf.d/newrelic.ini
+fi
+
+if [[ $SESSION_HANDLER == true ]]; then
+    echo "session.save_handler = $SESSION_HANDLER_NAME" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini
+    echo "session.save_path = $SESSION_HANDLER_PATH" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini
+fi
+
+sudo rm -rf var/cache/* var/logs/* &&
+    sudo mkdir -p /var/www/html/var/cache &&
+    sudo mkdir -p /var/www/html/var/logs &&
+    sudo mkdir -p /var/www/html/var/sessions &&
+    sudo chown -R www-data:www-data /var/www/html/var/cache && chmod 777 /var/www/html/var/cache &&
+    sudo chown -R www-data:www-data /var/www/html/var/logs && chmod 777 /var/www/html/var/logs &&
+    sudo chown -R www-data:www-data /var/www/html/var/sessions && chmod 777 /var/www/html/var/sessions
+
+apache2-foreground