🗃️ Committing everything that changed 🗃️

Dockerfile
rootfs/opt/echoip/geoip/GeoLite2-ASN.mmdb
rootfs/opt/echoip/geoip/GeoLite2-City.mmdb
rootfs/opt/echoip/geoip/GeoLite2-Country.mmdb
rootfs/tmp/update-geoip-db.sh
rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh
This commit is contained in:
casjay 2024-07-07 13:34:14 -04:00
parent ba0e61f764
commit 86eb9e6d8c
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
6 changed files with 12 additions and 8 deletions

View File

@ -15,8 +15,8 @@ ARG IMAGE_REPO="casjaysdev/alpine"
ARG IMAGE_VERSION="latest" ARG IMAGE_VERSION="latest"
ARG CONTAINER_VERSION="${IMAGE_VERSION}" ARG CONTAINER_VERSION="${IMAGE_VERSION}"
ARG SERVICE_PORT="8080" ARG SERVICE_PORT="80"
ARG EXPOSE_PORTS="8080" ARG EXPOSE_PORTS="80"
ARG PHP_VERSION="php81" ARG PHP_VERSION="php81"
ARG USER="root" ARG USER="root"

BIN
rootfs/opt/echoip/geoip/GeoLite2-ASN.mmdb Executable file → Normal file

Binary file not shown.

BIN
rootfs/opt/echoip/geoip/GeoLite2-City.mmdb Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 MiB

After

Width:  |  Height:  |  Size: 48 MiB

BIN
rootfs/opt/echoip/geoip/GeoLite2-Country.mmdb Executable file → Normal file

Binary file not shown.

View File

@ -34,12 +34,16 @@ SRC_DIR="${BASH_SOURCE%/*}"
# Set bash options # Set bash options
set -o pipefail set -o pipefail
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GEOIP_DATA_DIR="${1:-/opt/echoip/geoip}"
GEOIP_DOWNLOAD_URL="https://github.com/P3TERX/GeoLite.mmdb/raw/download"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
for f in GeoLite2-ASN GeoLite2-City GeoLite2-Country; do for f in GeoLite2-ASN GeoLite2-City GeoLite2-Country; do
if curl -q -LSsf "https://github.com/P3TERX/GeoLite.mmdb/raw/download/$f.mmdb" -o "/opt/echoip/geoip/$f.tmp"; then printf '%s : ' "Attempting to download from $GEOIP_DOWNLOAD_URL/$f.mmdb"
mv -f "/opt/echoip/geoip/$f.tmp" "/opt/echoip/geoip/$f.mmdb" if curl -q -LSsf "$GEOIP_DOWNLOAD_URL/$f.mmdb" -o "$GEOIP_DATA_DIR/$f.tmp"; then
[ -f "/opt/echoip/geoip/$f.mmdb" ] && echo "Installed $f.mmdb to /opt/echoip/geoip" mv -f "$GEOIP_DATA_DIR/$f.tmp" "$GEOIP_DATA_DIR/$f.mmdb"
[ -f "$GEOIP_DATA_DIR/$f.mmdb" ] && echo "Installed to $GEOIP_DATA_DIR/$f.mmdb"
else else
echo "Failed to update GeoIP $f" echo "Failed to update $GEOIP_DATA_DIR/$f.mmdb"
exit 10 exit 10
fi fi
done done

View File

@ -105,7 +105,7 @@ user_name="${IFCONFIG_USER_NAME:-}" # normal user name
user_pass="${IFCONFIG_USER_PASS_WORD:-}" # normal user password user_pass="${IFCONFIG_USER_PASS_WORD:-}" # normal user password
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# port which service is listening on # port which service is listening on
SERVICE_PORT="8080" SERVICE_PORT="80"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# User to use to launch service - IE: postgres # User to use to launch service - IE: postgres
RUNAS_USER="root" # normally root RUNAS_USER="root" # normally root
@ -125,7 +125,7 @@ EXEC_CMD_ARGS+='-t /opt/echoip/html ' # co
EXEC_CMD_ARGS+='-a /opt/echoip/geoip/GeoLite2-ASN.mmdb ' # 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+='-c /opt/echoip/geoip/GeoLite2-City.mmdb ' # command arguments
EXEC_CMD_ARGS+='-f /opt/echoip/geoip/GeoLite2-Country.mmdb ' # command arguments EXEC_CMD_ARGS+='-f /opt/echoip/geoip/GeoLite2-Country.mmdb ' # command arguments
EXEC_PRE_SCRIPT='' # execute script before EXEC_PRE_SCRIPT='sleep 60' # execute script before
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Is this service a web server # Is this service a web server
IS_WEB_SERVER="no" IS_WEB_SERVER="no"