diff --git a/.env.template b/.env.template index 55e71d3..846947b 100644 --- a/.env.template +++ b/.env.template @@ -8,3 +8,4 @@ SERVER_NAME=http://localhost:8080 DROPBOX_ACCESS_TOKEN= GOOGLE_MAPS_API_KEY= SLACK_WEBHOOK_URL= +NEWRELIC_LICENSE= diff --git a/docker-compose.yml b/docker-compose.yml index 7421255..a5a9823 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,5 +25,6 @@ services: - SERVER_NAME=$SERVER_NAME - GOOGLE_MAPS_API_KEY=$GOOGLE_MAPS_API_KEY - SLACK_WEBHOOK_URL=$SLACK_WEBHOOK_URL + - NEWRELIC_LICENSE=$NEWRELIC_LICENSE mediawiki: build: './mediawiki' diff --git a/php/Dockerfile b/php/Dockerfile index 60cb859..901c450 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,12 +1,14 @@ FROM php:7-fpm RUN apt-get -qq update && apt-get -qq install -y \ build-essential \ + git-core \ + gnupg2 \ + graphicsmagick \ libfreetype6-dev \ + libicu-dev \ libjpeg62-turbo-dev \ libpng-dev \ - libicu-dev \ - git-core \ - graphicsmagick \ + wget \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install -j$(nproc) gd intl mysqli \ && pecl install apcu \ @@ -18,6 +20,19 @@ ENV TZ=Asia/Kolkata RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone COPY php.ini /usr/local/etc/php/ + +# New Relic +RUN echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list \ + && wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - \ + && apt-get update \ + && apt-get -qq install -y newrelic-php5 \ + && NR_INSTALL_SILENT=1 newrelic-install install \ + && sed -i \ + -e "s/newrelic.appname =.*/newrelic.appname = \"Metakgp Wiki\"/" \ + -e "s/newrelic.license =.*/newrelic.license = \${NEWRELIC_LICENSE}/" \ + -e "s/;newrelic.framework =.*/newrelic.framework = \"mediawiki\"/" \ + /usr/local/etc/php/conf.d/newrelic.ini + RUN mkdir -p /var/log/mediawiki \ && touch /var/log/mediawiki/debug.log \ && chown -R www-data:www-data /var/log/mediawiki