From 4610f1f64f0bff25ac3859eb273d04a97d98791c Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 7 Jul 2024 11:07:50 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh --- Dockerfile | 1 + rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1bb8848..780a0c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -169,6 +169,7 @@ ENV PHP_VERSION="${PHP_VERSION}" ENV CONTAINER_NAME="${IMAGE_NAME}" ENV HOSTNAME="casjaysdev-${IMAGE_NAME}" ENV USER="${USER}" +ENV PATH="/opt/echoip:$PATH" COPY --from=build /. / diff --git a/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh b/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh index 34808d0..99eeeae 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh @@ -120,13 +120,14 @@ SERVICE_GID="0" # set the group id # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # execute command variables - keep single quotes variables will be expanded later EXEC_CMD_BIN='ifconfig' # command to execute -EXEC_CMD_ARGS='-r -s -p -l :$SERVICE_PORT ' # command arguments +EXEC_CMD_ARGS='-r -s -p ' # command arguments +EXEC_CMD_ARGS='-l :$SERVICE_PORT ' # command arguments +EXEC_CMD_ARGS+='-H X-Real-IP ' # command arguments +EXEC_CMD_ARGS+='-H x-forwarded-for ' # command arguments EXEC_CMD_ARGS+='-a /opt/echoip/geoip/GeoLite2-ASN.mmdb ' # command arguments EXEC_CMD_ARGS+='-c /opt/echoip/geoip/GeoLite2-City.mmdb ' # command arguments EXEC_CMD_ARGS+='-f /opt/echoip/geoip/GeoLite2-Country.mmdb ' # command arguments EXEC_CMD_ARGS+='-t /opt/echoip/html ' # command arguments -EXEC_CMD_ARGS+='-H X-Real-IP ' # command arguments -EXEC_CMD_ARGS+='-H x-forwarded-for ' # command arguments EXEC_PRE_SCRIPT='' # execute script before # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Is this service a web server