Skip to content
Merged
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ RUN yum -y install \

EXPOSE 80

RUN mkdir -p /var/lib/php/session
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a volume as well for session resume after a container restart?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't that be a project/environment level decision to map a volume to this particular path?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm speaking of the Dockerfile VOLUME syntax, which persists data across docker runs but not docker rm.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


COPY root /

VOLUME ["/var/log/httpd"]
VOLUME ["/var/log/httpd", "/var/lib/php/session"]

ENV PROXY_TIMEOUT 120
ENV PHP_MAX_EXECUTION_TIME 60
Expand Down
3 changes: 1 addition & 2 deletions root/etc/confd/templates/www.conf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ catch_workers_output = yes
; specified at startup with the -d argument
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
php_flag[display_errors] = off
;php_admin_value[error_log] = /opt/rh/php55/root/var/log/php-fpm/www-error.log
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This right here... if we could get this to work with a similarly generic path, we could move the stdout symlink to base as well and not manage it as a PHP-version variation. That's aside the point of this PR, just excited to see it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no reason we can't put that right into /var/log/php. Let's get this merged and I will review the various branches in apache-php and we can consolidate.

php_admin_flag[log_errors] = on
php_value[max_execution_time] = {{getenv "PHP_MAX_EXECUTION_TIME"}}
php_value[memory_limit] = {{getenv "PHP_MEMORY_LIMIT"}}
Expand All @@ -228,7 +227,7 @@ php_value[upload_max_filesize] = {{getenv "PHP_UPLOAD_MAX_FILESIZE"}}

; Set session path to a directory owned by process user
php_value[session.save_handler] = files
php_value[session.save_path] = /opt/rh/php55/root/var/lib/php/session
php_value[session.save_path] = /var/lib/php/session

; Pass the full ENV through.
clear_env = false