Skip to content

Commit 0fc9f1c

Browse files
author
Nicolas Huray
authored
Merge pull request #5 from bandsintown/log_workaround
Log workaround
2 parents 3f105b6 + 4bc8510 commit 0fc9f1c

5 files changed

Lines changed: 30 additions & 8 deletions

File tree

‎rootfs/etc/php-config/php-fpm.conf‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

rootfs/etc/php-config/php.ini renamed to rootfs/usr/local/etc/php/php.ini

File renamed without changes.

‎tests/image/01-package.bats‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,23 @@
22
run which php-fpm
33
[ $status -eq 0 ]
44
}
5+
6+
@test "'/usr/local/etc/php/php.ini' file should be present" {
7+
run ls /usr/local/etc/php/php.ini
8+
[ $status -eq 0 ]
9+
}
10+
11+
@test "'/usr/local/etc/php-fpm.d/docker.conf' file should be present" {
12+
run ls /usr/local/etc/php-fpm.d/docker.conf
13+
[ $status -eq 0 ]
14+
}
15+
16+
@test "a '/tmp/stdout' pipe should be present" {
17+
run test -p /tmp/stdout
18+
[ $status -eq 0 ]
19+
}
20+
21+
@test "the environment variable LOG_STREAM is set" {
22+
run test -n "${LOG_STREAM}"
23+
[ $status -eq 0 ]
24+
}

‎versions/5.6-fpm/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM bandsintown/alpine:3.6 as builder
22

33
FROM php:5.6.32-fpm-alpine
44

5-
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"
5+
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"
66

77
COPY --from=builder /usr/local/bin/consul /usr/local/bin/consul
88
COPY --from=builder /usr/local/bin/consul-template /usr/local/bin/consul-template
@@ -53,7 +53,9 @@ RUN echo $TZ > /etc/timezone \
5353

5454
EXPOSE 9000
5555

56-
ENV S6_LOGGING=1
56+
# Workaround https://bugs.php.net/bug.php?id=71880
57+
ENV LOG_STREAM="/tmp/stdout"
58+
RUN mkfifo $LOG_STREAM && chmod 777 $LOG_STREAM
5759

5860
ENTRYPOINT ["/init"]
59-
CMD ["php-fpm", "--pid", "/usr/local/var/run/php-fpm.pid"]
61+
CMD ["/bin/sh", "-c", "php-fpm --pid /usr/local/var/run/php-fpm.pid | tail -f $LOG_STREAM"]

‎versions/7.2-fpm/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM bandsintown/alpine:3.6 as builder
22

33
FROM php:7.2.0-fpm-alpine
44

5-
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"
5+
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"
66

77
COPY --from=builder /usr/local/bin/consul /usr/local/bin/consul
88
COPY --from=builder /usr/local/bin/consul-template /usr/local/bin/consul-template
@@ -52,7 +52,9 @@ RUN echo $TZ > /etc/timezone \
5252

5353
EXPOSE 9000
5454

55-
ENV S6_LOGGING=1
55+
# Workaround https://bugs.php.net/bug.php?id=71880
56+
ENV LOG_STREAM="/tmp/stdout"
57+
RUN mkfifo $LOG_STREAM && chmod 777 $LOG_STREAM
5658

5759
ENTRYPOINT ["/init"]
58-
CMD ["php-fpm", "--pid", "/usr/local/var/run/php-fpm.pid"]
60+
CMD ["/bin/sh", "-c", "php-fpm --pid /usr/local/var/run/php-fpm.pid | tail -f $LOG_STREAM"]

0 commit comments

Comments
 (0)