Skip to content

Avoid PHP_PORT variable name as it conflicts with "links: php:php" #6

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

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Avoid PHP_PORT variable name as it conflicts with "links: php:php" #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions files/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ set -e

# Export these so that apache can use them in the configuration files directly
export APP_WEBROOT=${APP_WEBROOT:-/app/html}
export PHP_HOSTNAME=${PHP_HOSTNAME:-php}
export PHP_PORT=${PHP_PORT:-9000}
export PHPFPM_HOSTNAME=${PHPFPM_HOSTNAME:-php}
export PHPFPM_PORT=${PHPFPM_PORT:-9000}

# List of ports to listen to, space separated list
WEB_PORTS_HTTP=${WEB_PORTS_HTTP:-80}

echo "* DocumentRoot: $APP_WEBROOT"
echo "* PHP-FPM: $PHP_HOSTNAME:$PHP_PORT"
echo "* PHP-FPM: $PHPFPM_HOSTNAME:$PHPFPM_PORT"

# If env variables SSL_KEY and SSL_CRT are set, configure apache for SSL access
if [ ! -z "$SSL_KEY" ] && [ ! -z "$SSL_CRT" ]; then
Expand Down
2 changes: 1 addition & 1 deletion files/httpd-vhost-ssl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SSLProxyProtocol all -SSLv3

# Handle PHP with PHP-FPM
<FilesMatch "\.php$">
SetHandler "proxy:fcgi://${PHP_HOSTNAME}:${PHP_PORT}"
SetHandler "proxy:fcgi://${PHPFPM_HOSTNAME}:${PHPFPM_PORT}"
</FilesMatch>

# If the php file doesn't exist, disable the proxy handler.
Expand Down
2 changes: 1 addition & 1 deletion files/httpd-vhost.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Handle PHP with PHP-FPM
<FilesMatch "\.php$">
SetHandler "proxy:fcgi://${PHP_HOSTNAME}:${PHP_PORT}"
SetHandler "proxy:fcgi://${PHPFPM_HOSTNAME}:${PHPFPM_PORT}"
</FilesMatch>

# If the php file doesn't exist, disable the proxy handler.
Expand Down