Merge pull request #5 from bandsintown/log_workaround

Log workaround
bandsintown · Feb 12, 2018 · 0fc9f1c · 0fc9f1c
2 parents 3f105b6 + 4bc8510
commit 0fc9f1c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/rootfs/etc/php-config/php-fpm.conf b/rootfs/etc/php-config/php-fpm.conf
diff --git a/rootfs/etc/php-config/php.ini → rootfs/usr/local/etc/php/php.ini b/rootfs/etc/php-config/php.ini → rootfs/usr/local/etc/php/php.ini
diff --git a/tests/image/01-package.bats b/tests/image/01-package.bats
@@ -2,3 +2,23 @@
   run which php-fpm
   [ $status -eq 0 ]
 }
+
+@test "'/usr/local/etc/php/php.ini' file should be present" {
+  run ls /usr/local/etc/php/php.ini
+  [ $status -eq 0 ]
+}
+
+@test "'/usr/local/etc/php-fpm.d/docker.conf' file should be present" {
+  run ls /usr/local/etc/php-fpm.d/docker.conf
+  [ $status -eq 0 ]
+}
+
+@test "a '/tmp/stdout' pipe should be present" {
+  run test -p /tmp/stdout
+  [ $status -eq 0 ]
+}
+
+@test "the environment variable LOG_STREAM is set" {
+  run test -n "${LOG_STREAM}"
+  [ $status -eq 0 ]
+}
diff --git a/versions/5.6-fpm/Dockerfile b/versions/5.6-fpm/Dockerfile
@@ -2,7 +2,7 @@ FROM bandsintown/alpine:3.6 as builder
 
 FROM php:5.6.32-fpm-alpine
 
-ENV S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York"
+ENV S6_LOGGING=1 S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York"
 
 COPY --from=builder /usr/local/bin/consul /usr/local/bin/consul
 COPY --from=builder /usr/local/bin/consul-template /usr/local/bin/consul-template
@@ -53,7 +53,9 @@ RUN echo $TZ > /etc/timezone \
 
 EXPOSE 9000
 
-ENV S6_LOGGING=1
+# Workaround https://bugs.php.net/bug.php?id=71880
+ENV LOG_STREAM="/tmp/stdout"
+RUN mkfifo $LOG_STREAM && chmod 777 $LOG_STREAM
 
 ENTRYPOINT ["/init"]
-CMD ["php-fpm", "--pid", "/usr/local/var/run/php-fpm.pid"]
+CMD ["/bin/sh", "-c", "php-fpm --pid /usr/local/var/run/php-fpm.pid | tail -f $LOG_STREAM"]
diff --git a/versions/7.2-fpm/Dockerfile b/versions/7.2-fpm/Dockerfile
@@ -2,7 +2,7 @@ FROM bandsintown/alpine:3.6 as builder
 
 FROM php:7.2.0-fpm-alpine
 
-ENV S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York" MEMCACHED_VERSION="memcached-3.0.0"
+ENV  S6_LOGGING=1 S6_OVERLAY_VERSION=1.19.1.1 GODNSMASQ_VERSION=1.0.7 CONSUL_TEMPLATE_VERSION=0.19.4 CONSUL_VERSION=0.8.4 MEMCACHED_DEPS="zlib-dev libmemcached-dev cyrus-sasl-dev" TZ="America/New_York" MEMCACHED_VERSION="memcached-3.0.0"
 
 COPY --from=builder /usr/local/bin/consul /usr/local/bin/consul
 COPY --from=builder /usr/local/bin/consul-template /usr/local/bin/consul-template
@@ -52,7 +52,9 @@ RUN echo $TZ > /etc/timezone \
 
 EXPOSE 9000
 
-ENV S6_LOGGING=1
+# Workaround https://bugs.php.net/bug.php?id=71880
+ENV LOG_STREAM="/tmp/stdout"
+RUN mkfifo $LOG_STREAM && chmod 777 $LOG_STREAM
 
 ENTRYPOINT ["/init"]
-CMD ["php-fpm", "--pid", "/usr/local/var/run/php-fpm.pid"]
+CMD ["/bin/sh", "-c", "php-fpm --pid /usr/local/var/run/php-fpm.pid | tail -f $LOG_STREAM"]