Reup over stderr handling issues with php-fpm

- Removes /manifest (pain to manage)

- Updates README

- Updates examples, removes composer example

- Replaces logging setup for php / nginx

- Dirty hack to exit supervisord on exit of either nginx or php-fpm.
(replace with event listener?)

- Sets error logging defaults

- Removes ini files, use passthrough from php-fpm pool conf, sets some
admin ones to prevent children causing issues

Author: lsl

Dockerfile

@@ -1,9 +1,28 @@
 FROM alpine:3.7
 
-# Setup user & /var/www dir
-RUN adduser -D -u 1000 -g 1000 -s /bin/sh -h /var/www www-data
+# Create user
+RUN adduser -D -u 1000 -g 1000 -s /bin/sh www-data && \
+    mkdir -p /www && \
+    chown -R www-data:www-data /www
 
-# PHP/FPM + Modules
+# Install tini - 'cause zombies - see: https://github.com/ochinchina/supervisord/issues/60
+# (also pkill hack)
+RUN apk add --no-cache --update tini
+
+# Install a golang port of supervisord
+COPY --from=ochinchina/supervisord:latest /usr/local/bin/supervisord /usr/bin/supervisord
+
+# Install nginx & gettext (envsubst)
+# Create cachedir and fix permissions
+RUN apk add --no-cache --update \
+    gettext \
+    nginx && \
+    mkdir -p /var/cache/nginx && \
+    chown -R www-data:www-data /var/cache/nginx && \
+    chown -R www-data:www-data /var/lib/nginx && \
+    chown -R www-data:www-data /var/tmp/nginx
+
+# Install PHP/FPM + Modules
 RUN apk add --no-cache --update \
     php7 \
     php7-apcu \
@@ -36,36 +55,20 @@ RUN apk add --no-cache --update \
     php7-zlib \
     php7-zmq
 
-# tini - 'cause zombies - see: https://github.com/ochinchina/supervisord/issues/60
-# gettext - nginx envsubst
-RUN apk add --no-cache --update \
-    tini \
-    gettext \
-    nginx && \
-    rm -rf /var/www/localhost
-
-# Fix nginx dirs/perms
-RUN mkdir -p /var/cache/nginx && \
-    chown -R www-data:www-data /var/cache/nginx && \
-    chown -R www-data:www-data /var/lib/nginx && \
-    chown -R www-data:www-data /var/tmp/nginx
-
-# Install a golang port of supervisord
-COPY --from=ochinchina/supervisord:latest /usr/local/bin/supervisord /usr/bin/supervisord
-
 # Runtime env vars are envstub'd into config during entrypoint
 ENV SERVER_NAME="localhost"
 ENV SERVER_ALIAS=""
-ENV SERVER_ROOT=/var/www
+ENV SERVER_ROOT=/www
+
 # Alias defaults to empty, example usage:
 # SERVER_ALIAS='www.example.com'
 
-COPY manifest /
-
-WORKDIR /var/www
-
-# nginx: 80, xdebug: 9000 (currently disabled)
-EXPOSE 80 9000
+COPY ./supervisord.conf /supervisord.conf
+COPY ./php-fpm-www.conf /etc/php7/php-fpm.d/www.conf
+COPY ./nginx.conf.template /nginx.conf.template
+COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 
-ENTRYPOINT ["tini", "--"]
-CMD ["supervisord", "-c", "/etc/supervisord.conf"]
+# Nginx on :80
+EXPOSE 80
+WORKDIR /www
+ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]

README.md

@@ -20,11 +20,11 @@ This image runs supervisord in the foreground which in turn runs nginx/php-fpm i
 
 ### Example standalone usage (available at http://localhost/)
 
-`docker run --rm -it -p80:80 lslio/nginx-php-fpm`
+`docker run --rm -it -p80:80 -v ~/www:/www lslio/nginx-php-fpm`
 
 ### Example usage with volume map and server name change (available at http://example.localhost/)
 
-`docker run --rm -it -v ~/my/src:/var/www -p 80:80 -e SERVER_NAME=example.localhost lslio/nginx-php-fpm`
+`docker run --rm -it -v ~/www:/www -p 80:80 -e SERVER_NAME=example.localhost lslio/nginx-php-fpm`
 
 ### Example [Dockerfile](https://github.com/lsl/docker-nginx-php-fpm/blob/master/examples/Dockerfile.basic) usage
 
@@ -33,45 +33,21 @@ FROM lslio/nginx-php-fpm
 
 ENV SERVER_NAME=example.com
 ENV SERVER_ALIAS=www.example.com
-ENV SERVER_ROOT=/var/www
+ENV SERVER_ROOT=/www
 
-COPY . /var/www
-```
-
-### Example [Dockerfile](https://github.com/lsl/docker-nginx-php-fpm/blob/master/examples/Dockerfile.composer) usage with a [composer](https://github.com/lsl/docker-composer) build step
-
-(Use [lslio/composer](https://github.com/lsl/docker-composer) for faster builds.)
-
-```
-FROM lslio/composer:latest as composer
-
-COPY ./composer.* /var/www/
-RUN composer-install -d /var/www
-
-COPY . /var/www
-RUN composer-dump-autoload -d /var/www
-
-FROM lslio/nginx-php-fpm
-
-# Install extra modules (if you need them)
-# RUN apk add --no-cache --update -X 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' php7-msgpack php7-gearman
-
-ENV SERVER_NAME=example.com
-ENV SERVER_ALIAS=www.example.com
-ENV SERVER_ROOT=/var/www
-
-COPY --from=composer --chown=www-data:www-data /var/www /var/www
+COPY . /www
 ```
 
 ### Example [docker-compose.yml](https://github.com/lsl/docker-nginx-php-fpm/blob/master/examples/docker-compose.yml)
+
 ```
 version: '3.6'
 
 services:
   example:
     image: lslio/nginx-php-fpm
     volumes:
-      - .:/var/www
+      - .:/www
     ports:
       - "80:80"
     environment:
@@ -93,20 +69,20 @@ services:
   example-web:
     image: lslio/nginx-php-fpm
     volumes:
-      - ./web:/var/www
+      - ./web:/www
     environment:
       VIRTUAL_HOST: "example.localhost"
-      SERVER_ROOT: "/var/www/public"
+      SERVER_ROOT: "/www/public"
 
   example-api:
     image: lslio/nginx-php-fpm
     volumes:
-      - ./api:/var/www
+      - ./api:/www
     environment:
       VIRTUAL_HOST: "api.example.localhost"
-      SERVER_ROOT: "/var/www/public"
+      SERVER_ROOT: "/www/public"
 ```
 
 ## Props
 - Got a lot of ideas from [boxedcode/alpine-nginx-php-fpm](https://gitlab.com/boxedcode/alpine-nginx-php-fpm).
-- This golang [supervisord port](https://github.com/ochinchina/supervisord) reduces the final image by about half.
+- This golang [supervisord port](https://github.com/ochinchina/supervisord) reduces the final image by about half.

manifest/auto-fpm.sh renamed to auto-fpm.sh

@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+# jwilder/nginx-proxy support
+SERVER_NAME=${VIRTUAL_HOST:-${SERVER_NAME:-localhost}}
+
+envsubst '$SERVER_NAME $SERVER_ALIAS $SERVER_ROOT' < /nginx.conf.template > /etc/nginx/nginx.conf
+
+supervisord -c /supervisord.conf
+

docker-entrypoint.sh

@@ -2,6 +2,6 @@ FROM lslio/nginx-php-fpm
 
 ENV SERVER_NAME=example.com
 ENV SERVER_ALIAS=www.example.com
-ENV SERVER_ROOT=/var/www
+ENV SERVER_ROOT=/www
 
-COPY . /var/www
+COPY . /www

examples/Dockerfile.basic renamed to examples/Dockerfile

@@ -1,3 +1,5 @@
+# Example running multiple laravel applications
+# behind nginx-proxy for development
 version: '3.6'
 
 services:
@@ -11,15 +13,15 @@ services:
   example-web:
     image: lslio/nginx-php-fpm
     volumes:
-      - ./web:/var/www
+      - ./web:/www
     environment:
       VIRTUAL_HOST: "example.localhost"
-      SERVER_ROOT: "/var/www/public"
+      SERVER_ROOT: "/www/public"
 
   example-api:
     image: lslio/nginx-php-fpm
     volumes:
-      - ./api:/var/www
+      - ./api:/www
     environment:
       VIRTUAL_HOST: "api.example.localhost"
-      SERVER_ROOT: "/var/www/public"
+      SERVER_ROOT: "/www/public"

examples/Dockerfile.composer

@@ -1,11 +1,18 @@
 version: '3.6'
 
 services:
-  example:
+  builder:
     image: lslio/nginx-php-fpm
+    build: ../
+    entrypoint: /bin/true
+
+  example:
+    image: lslio/nginx-php-fpm-example
+    build: ./
     volumes:
-      - .:/var/www
+      - .:/www
     ports:
       - "80:80"
     environment:
-      SERVER_NAME: "example.localhost"
+      SERVER_NAME: "example.localhost"
+

examples/docker-compose-multisite.yml

@@ -0,0 +1,3 @@
+<?php
+
+phpinfo();