Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Log workaround #5

Merged
merged 2 commits into from Feb 12, 2018
Merged

Log workaround #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d57ac
Remove unused configuration file
Feb 12, 2018
4bc8510
Implement Log workaround and update tests
Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions rootfs/etc/php-config/php-fpm.conf
View file
Open in desktop

This file was deleted.

0 rootfs/etc/php-config/php.ini → rootfs/usr/local/etc/php/php.ini
View file
Open in desktop
File renamed without changes.
20 changes: 20 additions & 0 deletions tests/image/01-package.bats
View file
Open in desktop
Expand Up @@ -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 ]
}
8 changes: 5 additions & 3 deletions versions/5.6-fpm/Dockerfile
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
8 changes: 5 additions & 3 deletions versions/7.2-fpm/Dockerfile
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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"]