Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CACHE_PREFIX=
MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_HOST=redis
REDIS_PASSWORD=null
REDIS_PORT=6379

Expand Down
10 changes: 8 additions & 2 deletions docker/common/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,14 @@ COPY --from=builder /usr/local/bin/docker-php-ext-* /usr/local/bin/
# -----------------------------------------------------------
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

# Enable PHP-FPM status page by modifying zz-docker.conf with sed
RUN sed -i '/\[www\]/a pm.status_path = /status' /usr/local/etc/php-fpm.d/zz-docker.conf
# Create new fpm conf file, because zz-fpm-docker.conf should not be overridden
# See: https://hub.docker.com/_/php#fpm-configuration
RUN set -eux; \
{ \
echo '[www]'; \
echo 'pm.status_path = /status'; \
} > /usr/local/etc/php-fpm.d/zz-fpm-docker.conf

# Update the variables_order to include E (for ENV)
#RUN sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/' "$PHP_INI_DIR/php.ini"

Expand Down