Merge pull request #6 from jalxes/patch-1

Update Dockerfile

Author: Móveis Simonetti

Dockerfile

@@ -3,60 +3,67 @@ FROM php:7.2-apache
 
 ENV http_proxy ${HTTP_PROXY}
 ENV https_proxy ${HTTP_PROXY}
+ENV XDEBUG_ENABLED=false
+ENV NR_ENABLED=false
+ENV NR_APP_NAME=""
+ENV NR_LICENSE_KEY=""
+ENV SESSION_HANDLER=false
+ENV SESSION_HANDLER_NAME=""
+ENV SESSION_HANDLER_PATH=""
 
-COPY configs/ports.conf /etc/apache2/ports.conf
-COPY apache-run.sh /usr/bin/apache-run
-
-RUN chmod a+x /usr/bin/apache-run
-
-# Install libs
-RUN apt-get update && apt-get install -y wget supervisor libfreetype6-dev \
-        libjpeg62-turbo-dev libpng-dev git libxslt-dev \
-       libldap2-dev libicu-dev libc-client-dev libkrb5-dev
+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
 
 RUN a2enmod rewrite
 
-# Install PHP extensions
 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) bcmath \
-        gd pdo_mysql calendar exif gettext \
-        xsl ldap intl imap \
-        pcntl shmop soap sockets wddx zip
-
-# Install ssh2
-RUN apt-get update && apt-get -y install libssh2-1-dev && \
-    pecl install -f ssh2-alpha && \
-    echo "extension=ssh2.so" >> /usr/local/etc/php/conf.d/ssh2.ini && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install oci8
-RUN apt-get update && apt-get -y install wget bsdtar libaio1 && \
-    wget -qO- https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-basic-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local && \
-    wget -qO- https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-sdk-linux.x64-12.2.0.1.0.zip | bsdtar -xvf-  -C /usr/local && \
-    wget -qO- https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local && \
-    ln -s /usr/local/instantclient_12_2 /usr/local/instantclient && \
-    ln -s /usr/local/instantclient/libclntsh.so.* /usr/local/instantclient/libclntsh.so && \
-    ln -s /usr/local/instantclient/lib* /usr/lib && \
-    ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus && \
-    docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/local/instantclient && \
-    docker-php-ext-install oci8 && \
-    rm -rf /var/lib/apt/lists/* && \
-    php -v
-
-# Install redis
+    && 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
+
 RUN pecl install redis \
-    && docker-php-ext-enable redis
+    && echo "extension=redis.so" >> /usr/local/etc/php/conf.d/redis.ini
+
+RUN echo "---> Adding Support for NewRelic" && \
+    mkdir /tmp/newrelic /scripts/ && \
+    cd /tmp/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 && \
+    cp ./daemon/newrelic-daemon.x64 /usr/bin/newrelic-daemon && \
+    cp ./scripts/newrelic.ini.template /scripts/newrelic.ini && \
+    mkdir /var/log/newrelic &&  \
+    chown -R www-data:www-data /var/log/newrelic && \
+    rm -rf /tmp/*
+
+RUN echo "---> Adding Tini" && \
+    wget -O /tini https://github.com/krallin/tini/releases/download/v0.18.0/tini-static && \
+    chmod +x /tini
+
+RUN echo "---> Config sudoers" && \
+    echo "www-data  ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers
 
-# Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
-# Install XDebug
 RUN pecl install xdebug
 
-# Run composer install
-CMD /usr/bin/apache-run
+COPY configs/ports.conf /etc/apache2/ports.conf
+COPY apache-run.sh /usr/bin/apache-run
+
+RUN chmod a+x /usr/bin/apache-run
+
+USER www-data
+
+WORKDIR "/var/www/html"
+
+EXPOSE 8080 9001
 
-EXPOSE 8080
+CMD ["/tini", "--", "/usr/bin/apache-run"]