diff --git a/nginad/Dockerfile b/nginad/Dockerfile index 2f673cd..fe3e79a 100644 --- a/nginad/Dockerfile +++ b/nginad/Dockerfile @@ -5,24 +5,29 @@ FROM alpine MAINTAINER kev +ENV NGINAD_VER 1.6.12 +ENV NGINAD_URL https://github.com/nginadfoundation/nginad/archive/${NGINAD_VER}.tar.gz + WORKDIR /var/www/html -RUN apk add -U git \ - gzip \ - nginx \ - php-apcu \ - php-curl \ - php-fpm \ - php-iconv \ - php-json \ - php-openssl \ - php-pdo \ - php-pdo_mysql \ - php-phar \ - php-xml \ - php-zlib \ - tar \ - && wget -O- https://github.com/nginadfoundation/nginad/archive/1.6.5.tar.gz | tar xz --strip 1 \ +RUN apk add --no-cache curl \ + git \ + gzip \ + nginx \ + php5-apcu \ + php5-curl \ + php5-fpm \ + php5-iconv \ + php5-json \ + php5-openssl \ + php5-pdo \ + php5-pdo_mysql \ + php5-phar \ + php5-xml \ + php5-zlib \ + tar \ + && touch /etc/php5/fpm.d/empty.conf \ + && curl -sSL ${NGINAD_URL} | tar xz --strip 1 \ && cd upload \ && php composer.phar self-update \ && php composer.phar install \ @@ -34,8 +39,7 @@ RUN apk add -U git \ && cp rtb.config.local.php.dist rtb.config.local.php \ && sed -i -e "s/'pass' => ''/'pass' => 'root'/" \ -e "s/'host' => 'localhost'/'host' => 'mysql'/" database.local.php \ - && apk del git \ - && rm -rf /var/cache/apk/* + && apk del curl git COPY nginx.conf /etc/nginx/nginx.conf diff --git a/nginad/nginx.conf b/nginad/nginx.conf index 0d65e87..7b2c89b 100644 --- a/nginad/nginx.conf +++ b/nginad/nginx.conf @@ -1,5 +1,6 @@ user nobody; worker_processes 4; +pid /run/nginx.pid; events { worker_connections 1024;