mirror of
https://github.com/pi-hole/docker-pi-hole.git
synced 2025-12-20 02:18:51 +00:00
Move all scripts to /usr/local/bin to simplify dockerfile
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
@@ -6,7 +6,6 @@ ENV PIHOLE_DOCKER_TAG "${PIHOLE_DOCKER_TAG}"
|
||||
|
||||
ENV S6_OVERLAY_VERSION v3.1.1.2
|
||||
|
||||
COPY ./scripts/install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh
|
||||
|
||||
ENTRYPOINT [ "/s6-init" ]
|
||||
@@ -22,9 +21,6 @@ ARG PHP_ENV_CONFIG
|
||||
ENV PHP_ENV_CONFIG /etc/lighttpd/conf-enabled/15-fastcgi-php.conf
|
||||
ARG PHP_ERROR_LOG
|
||||
ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log
|
||||
COPY ./scripts/start.sh /
|
||||
COPY ./scripts/bash_functions.sh /
|
||||
COPY ./scripts/gravityonboot.sh /
|
||||
|
||||
# IPv6 disable flag for networks/devices that do not support it
|
||||
ENV IPv6 True
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/command/execlineb
|
||||
background { bash -e /gravityonboot.sh }
|
||||
background { bash -e /usr/local/bin/gravityonboot.sh }
|
||||
@@ -0,0 +1 @@
|
||||
_uid-gid-changer
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/command/execlineb
|
||||
foreground { bash -e /start.sh }
|
||||
foreground { bash -e /usr/local/bin/start.sh }
|
||||
@@ -6,7 +6,7 @@ fi
|
||||
|
||||
# The below functions are all contained in bash_functions.sh
|
||||
# shellcheck source=/dev/null
|
||||
. /bash_functions.sh
|
||||
. /usr/local/bin/bash_functions.sh
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
SKIP_INSTALL=true . "${PIHOLE_INSTALL}"
|
||||
Reference in New Issue
Block a user