First 7.1 build with nginx complie

2017-02-05 22:46:45 +00:00
parent cab88604a6
commit c445176457
4 changed files with 157 additions and 51 deletions
--- a/188
+++ b/188
@@ -1,51 +1,150 @@
-FROM nginx:mainline-alpine
+FROM php:7.1-fpm-alpine

 MAINTAINER ngineered <support@ngineered.co.uk>

-ENV php_conf /etc/php7/php.ini 
-ENV fpm_conf /etc/php7/php-fpm.d/www.conf
+ENV php_conf /usr/local/etc/php-fpm.conf 
+ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
 ENV composer_hash 55d6ead61b29c7bdee5cccfb50076874187bd9f21f65d8991d46ec5cc90518f447387fb9f76ebae1fbbacf329e583e30

+ENV NGINX_VERSION 1.11.9
+
+RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
+  && CONFIG="\
+    --prefix=/etc/nginx \
+    --sbin-path=/usr/sbin/nginx \
+    --modules-path=/usr/lib/nginx/modules \
+    --conf-path=/etc/nginx/nginx.conf \
+    --error-log-path=/var/log/nginx/error.log \
+    --http-log-path=/var/log/nginx/access.log \
+    --pid-path=/var/run/nginx.pid \
+    --lock-path=/var/run/nginx.lock \
+    --http-client-body-temp-path=/var/cache/nginx/client_temp \
+    --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
+    --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
+    --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
+    --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
+    --user=nginx \
+    --group=nginx \
+    --with-http_ssl_module \
+    --with-http_realip_module \
+    --with-http_addition_module \
+    --with-http_sub_module \
+    --with-http_dav_module \
+    --with-http_flv_module \
+    --with-http_mp4_module \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_random_index_module \
+    --with-http_secure_link_module \
+    --with-http_stub_status_module \
+    --with-http_auth_request_module \
+    --with-http_xslt_module=dynamic \
+    --with-http_image_filter_module=dynamic \
+    --with-http_geoip_module=dynamic \
+    --with-http_perl_module=dynamic \
+    --with-threads \
+    --with-stream \
+    --with-stream_ssl_module \
+    --with-stream_ssl_preread_module \
+    --with-stream_realip_module \
+    --with-stream_geoip_module=dynamic \
+    --with-http_slice_module \
+    --with-mail \
+    --with-mail_ssl_module \
+    --with-compat \
+    --with-file-aio \
+    --with-http_v2_module \
+  " \
+  && addgroup -S nginx \
+  && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
+  && apk add --no-cache --virtual .build-deps \
+    gcc \
+    libc-dev \
+    make \
+    openssl-dev \
+    pcre-dev \
+    zlib-dev \
+    linux-headers \
+    curl \
+    gnupg \
+    libxslt-dev \
+    gd-dev \
+    geoip-dev \
+    perl-dev \
+  && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
+  && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc  -o nginx.tar.gz.asc \
+  && export GNUPGHOME="$(mktemp -d)" \
+  && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEYS" \
+  && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
+  && rm -r "$GNUPGHOME" nginx.tar.gz.asc \
+  && mkdir -p /usr/src \
+  && tar -zxC /usr/src -f nginx.tar.gz \
+  && rm nginx.tar.gz \
+  && cd /usr/src/nginx-$NGINX_VERSION \
+  && ./configure $CONFIG --with-debug \
+  && make -j$(getconf _NPROCESSORS_ONLN) \
+  && mv objs/nginx objs/nginx-debug \
+  && mv objs/ngx_http_xslt_filter_module.so objs/ngx_http_xslt_filter_module-debug.so \
+  && mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \
+  && mv objs/ngx_http_geoip_module.so objs/ngx_http_geoip_module-debug.so \
+  && mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so \
+  && mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so \
+  && ./configure $CONFIG \
+  && make -j$(getconf _NPROCESSORS_ONLN) \
+  && make install \
+  && rm -rf /etc/nginx/html/ \
+  && mkdir /etc/nginx/conf.d/ \
+  && mkdir -p /usr/share/nginx/html/ \
+  && install -m644 html/index.html /usr/share/nginx/html/ \
+  && install -m644 html/50x.html /usr/share/nginx/html/ \
+  && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \
+  && install -m755 objs/ngx_http_xslt_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_xslt_filter_module-debug.so \
+  && install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \
+  && install -m755 objs/ngx_http_geoip_module-debug.so /usr/lib/nginx/modules/ngx_http_geoip_module-debug.so \
+  && install -m755 objs/ngx_http_perl_module-debug.so /usr/lib/nginx/modules/ngx_http_perl_module-debug.so \
+  && install -m755 objs/ngx_stream_geoip_module-debug.so /usr/lib/nginx/modules/ngx_stream_geoip_module-debug.so \
+  && ln -s ../../usr/lib/nginx/modules /etc/nginx/modules \
+  && strip /usr/sbin/nginx* \
+  && strip /usr/lib/nginx/modules/*.so \
+  && rm -rf /usr/src/nginx-$NGINX_VERSION \
+  \
+  # Bring in gettext so we can get `envsubst`, then throw
+  # the rest away. To do this, we need to install `gettext`
+  # then move `envsubst` out of the way so `gettext` can
+  # be deleted completely, then move `envsubst` back.
+  && apk add --no-cache --virtual .gettext gettext \
+  && mv /usr/bin/envsubst /tmp/ \
+  \
+  && runDeps="$( \
+    scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
+      | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
+      | sort -u \
+      | xargs -r apk info --installed \
+      | sort -u \
+  )" \
+  && apk add --no-cache --virtual .nginx-rundeps $runDeps \
+  && apk del .build-deps \
+  && apk del .gettext \
+  && mv /tmp/envsubst /usr/local/bin/ \
+  \
+  # forward request and error logs to docker log collector
+  && ln -sf /dev/stdout /var/log/nginx/access.log \
+  && ln -sf /dev/stderr /var/log/nginx/error.log
+
 RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
-    sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
+#    sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
    echo /etc/apk/respositories && \
    apk update && \
    apk add --no-cache bash \ 
    openssh-client \
    wget \
-    nginx \
    supervisor \
    curl \
+    libcurl \
    git \
-    php7-fpm \
-    php7-pdo \
-    php7-pdo_mysql \
-    php7-mysqlnd \
-    php7-mysqli \
-    php7-mcrypt \
-    php7-mbstring \
-    php7-ctype \
-    php7-zlib \
-    php7-gd \
-    php7-exif \
-    php7-intl \
-    php7-sqlite3 \
-    php7-pdo_pgsql \
-    php7-pgsql \
-    php7-xml \
-    php7-xsl \
-    php7-curl \
-    php7-openssl \
-    php7-iconv \
-    php7-json \
-    php7-phar \
-    php7-soap \
-    php7-dom \
-    php7-zip \
-    php7-session \
    python \
    python-dev \
-    py2-pip \
+    py-pip \
    augeas-dev \
    openssl-dev \
    ca-certificates \
@@ -53,20 +152,27 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
    gcc \
    musl-dev \
    linux-headers \
+    libmcrypt-dev \
+    libpng-dev \
+    icu-dev \
+    libpq \
+    libxslt-dev \
    libffi-dev &&\
+    #curl iconv session
+    docker-php-ext-install pdo_mysql mysqli mcrypt gd exif intl xsl json soap dom zip && \
    mkdir -p /etc/nginx && \
    mkdir -p /var/www/app && \
    mkdir -p /run/nginx && \
    mkdir -p /var/log/supervisor && \
-    php7 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
-    php7 -r "if (hash_file('SHA384', 'composer-setup.php') === '${composer_hash}') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
-    php7 composer-setup.php --install-dir=/usr/bin --filename=composer && \
-    php7 -r "unlink('composer-setup.php');" && \
+    php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+    php -r "if (hash_file('SHA384', 'composer-setup.php') === '${composer_hash}') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
+    php composer-setup.php --install-dir=/usr/bin --filename=composer && \
+    php -r "unlink('composer-setup.php');"  && \
    pip install -U pip && \
    pip install -U certbot && \
    mkdir -p /etc/letsencrypt/webrootauth && \
-    apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev && \
-    ln -s /usr/bin/php7 /usr/bin/php
+    apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev
+#    ln -s /usr/bin/php7 /usr/bin/php

 ADD conf/supervisord.conf /etc/supervisord.conf

@@ -106,9 +212,9 @@ RUN sed -i \
        -e "s/;listen.group = nobody/listen.group = nginx/g" \
        -e "s/listen = 127.0.0.1:9000/listen = \/var\/run\/php-fpm.sock/g" \
        -e "s/^;clear_env = no$/clear_env = no/" \
-        ${fpm_conf} && \
-    ln -s /etc/php7/php.ini /etc/php7/conf.d/php.ini && \
-    find /etc/php7/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
+        ${fpm_conf}
+#    ln -s /etc/php7/php.ini /etc/php7/conf.d/php.ini && \
+#    find /etc/php7/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;


 # Add Scripts
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ The Docker hub build can be found here: [https://registry.hub.docker.com/u/richa
 ## Versions
 | Tag | Nginx | PHP | Alpine |
 |-----|-------|-----|--------|
-| latest | 1.11.5 | 7.0.14 | 3.4@edge |
-| php7   | 1.11.5 | 7.0.14 | 3.4@edge |
+| latest | 1.11.9 | 7.1.1 | 3.4 |
+| php7   | 1.11.9 | 7.1.1 | 3.4 |
 | php5   | 1.11.5 | 5.6.29 | 3.4 |

 **PLEASE NOTE: PHP7 is now the default**
--- a/conf/supervisord.conf
+++ b/conf/supervisord.conf
@@ -21,8 +21,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 [supervisorctl]
 serverurl=unix:///dev/shm/supervisor.sock ; use a unix:// URL  for a unix socket

-[program:php-fpm7]
-command = /usr/sbin/php-fpm7 --nodaemonize --fpm-config /etc/php7/php-fpm.d/www.conf
+[program:php-fpm]
+command = /usr/local/sbin/php-fpm --nodaemonize --fpm-config /usr/local/etc/php-fpm.d/www.conf
 autostart=true
 autorestart=true
 priority=5
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -67,31 +67,31 @@ fi

 # Display PHP error's or not
 if [[ "$ERRORS" != "1" ]] ; then
- echo php_flag[display_errors] = off >> /etc/php7/php-fpm.conf
+ echo php_flag[display_errors] = off >> /usr/local/etc/php-fpm.conf
 else
- echo php_flag[display_errors] = on >> /etc/php7/php-fpm.conf
+ echo php_flag[display_errors] = on >> /usr/local/etc/php-fpm.conf
 fi

 # Display Version Details or not
 if [[ "$HIDE_NGINX_HEADERS" == "0" ]] ; then
 sed -i "s/server_tokens off;/server_tokens on;/g" /etc/nginx/nginx.conf
 else
- sed -i "s/expose_php = On/expose_php = Off/g" /etc/php7/conf.d/php.ini
+ sed -i "s/expose_php = On/expose_php = Off/g" /usr/local/etc/php-fpm.conf
 fi

 # Increase the memory_limit
 if [ ! -z "$PHP_MEM_LIMIT" ]; then
- sed -i "s/memory_limit = 128M/memory_limit = ${PHP_MEM_LIMIT}M/g" /etc/php7/conf.d/php.ini
+ sed -i "s/memory_limit = 128M/memory_limit = ${PHP_MEM_LIMIT}M/g" /usr/local/etc/php-fpm.conf
 fi

 # Increase the post_max_size
 if [ ! -z "$PHP_POST_MAX_SIZE" ]; then
- sed -i "s/post_max_size = 100M/post_max_size = ${PHP_POST_MAX_SIZE}M/g" /etc/php7/conf.d/php.ini
+ sed -i "s/post_max_size = 100M/post_max_size = ${PHP_POST_MAX_SIZE}M/g" /usr/local/etc/php-fpm.conf
 fi

 # Increase the upload_max_filesize
 if [ ! -z "$PHP_UPLOAD_MAX_FILESIZE" ]; then
- sed -i "s/upload_max_filesize = 100M/upload_max_filesize= ${PHP_UPLOAD_MAX_FILESIZE}M/g" /etc/php7/conf.d/php.ini
+ sed -i "s/upload_max_filesize = 100M/upload_max_filesize= ${PHP_UPLOAD_MAX_FILESIZE}M/g" /usr/local/etc/php-fpm.conf
 fi

 # Always chown webroot for better mounting