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
14 changes: 14 additions & 0 deletions files/entrypoint-extras.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,17 @@ fi
if [ ! -z "${PHP_INI_OVERRIDE}" ]; then
echo "${PHP_INI_OVERRIDE}" | sed -e 's/\\n/\n/g' > /usr/local/etc/php/conf.d/zz-02-custom.ini
fi
unset PHP_INI_OVERRIDE

# Remove ENV variables that are meant only for the SSH container

unset SSH_PRIVATE_KEY
unset IMPORT_GITLAB_PUB_KEYS
unset IMPORT_GITHUB_PUB_KEYS
unset IMPORT_PUB_KEYS
unset SSH_CONFIG SSH_KNOWN_HOSTS

# Remove ENV variables that are meant only for the web container

unset HTTPD_EXTRA_CONF SSL_KEY SSL_CRT WEB_PORTS_HTTP WEB_PORTS_HTTPS

1 change: 1 addition & 0 deletions files/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ if [ ! -z "${PHP_FPM_OVERRIDE}" ]; then
echo "; Customizations from PHP_FPM_OVERRIDE:" >> $PHP_FPM_POOL_CONF
echo "${PHP_FPM_OVERRIDE}" | sed -e 's/\\n/\n/g' >> $PHP_FPM_POOL_CONF
fi
unset PHP_FPM_OVERRIDE

# Start the "real" entrypoint
. /usr/local/bin/docker-php-entrypoint