Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-24 04:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

I don't know why PHP_ENV_CONFIG is an environment variable. We don't need it to be

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2023-01-18 15:26:29 +00:00
parent 91161b7ec6
commit 61bd3c756a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Dockerfile
View File

@@ -12,9 +12,6 @@ COPY s6/service /usr/local/bin/service
RUN bash -ex install.sh 2>&1 && \ RUN bash -ex install.sh 2>&1 && \
rm -rf /var/cache/apt/archives /var/lib/apt/lists/* rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
# php config start passes special ENVs into
ARG PHP_ENV_CONFIG
ENV PHP_ENV_CONFIG /etc/lighttpd/conf-enabled/15-pihole-admin.conf
ARG PHP_ERROR_LOG ARG PHP_ERROR_LOG
ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log

10
src/s6/debian-root/usr/local/bin/bash_functions.sh
View File

@@ -348,6 +348,8 @@ setup_lighttpd_bind() {
} }
setup_web_php_env() { setup_web_php_env() {
local config_file
config_file="/etc/lighttpd/conf-available/15-pihole-admin.conf"
# if the environment variable VIRTUAL_HOST is not set, or is empty, then set it to the IP address of the container # if the environment variable VIRTUAL_HOST is not set, or is empty, then set it to the IP address of the container
if [ -z "${VIRTUAL_HOST}" ] || [ "${VIRTUAL_HOST}" == "" ]; then if [ -z "${VIRTUAL_HOST}" ] || [ "${VIRTUAL_HOST}" == "" ]; then
VIRTUAL_HOST="${FTLCONF_LOCAL_IPV4}" VIRTUAL_HOST="${FTLCONF_LOCAL_IPV4}"
@@ -355,17 +357,17 @@ setup_web_php_env() {
for config_var in "VIRTUAL_HOST" "CORS_HOSTS" "PHP_ERROR_LOG" "PIHOLE_DOCKER_TAG" "TZ"; do for config_var in "VIRTUAL_HOST" "CORS_HOSTS" "PHP_ERROR_LOG" "PIHOLE_DOCKER_TAG" "TZ"; do
local beginning_of_line=" \"${config_var}\" => " local beginning_of_line=" \"${config_var}\" => "
if grep -qP "^$beginning_of_line" "$PHP_ENV_CONFIG" ; then if grep -qP "^$beginning_of_line" "$config_file" ; then
# replace line if already present # replace line if already present
sed -i "/${beginning_of_line}/c\\${beginning_of_line}\"${!config_var}\"," "$PHP_ENV_CONFIG" sed -i "/${beginning_of_line}/c\\${beginning_of_line}\"${!config_var}\"," "$config_file"
else else
# add line otherwise # add line otherwise
sed -i "/bin-environment/ a\\${beginning_of_line}\"${!config_var}\"," "$PHP_ENV_CONFIG" sed -i "/bin-environment/ a\\${beginning_of_line}\"${!config_var}\"," "$config_file"
fi fi
done done
echo " [i] Added ENV to php:" echo " [i] Added ENV to php:"
grep -E '(VIRTUAL_HOST|CORS_HOSTS|PHP_ERROR_LOG|PIHOLE_DOCKER_TAG|TZ)' "$PHP_ENV_CONFIG" grep -E '(VIRTUAL_HOST|CORS_HOSTS|PHP_ERROR_LOG|PIHOLE_DOCKER_TAG|TZ)' "$config_file"
} }
setup_web_port() { setup_web_port() {