diff --git a/.env.scripts b/.env.scripts index 302e7f6..5599c56 100644 --- a/.env.scripts +++ b/.env.scripts @@ -42,7 +42,7 @@ ENV_DISTRO_TAG="${IMAGE_VERSION}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Env SERVICE_PORT="80" -EXPOSE_PORTS="" +EXPOSE_PORTS="6800" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Versions PHP_VERSION="system" diff --git a/Dockerfile b/Dockerfile index b24e186..62a625e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG USER="root" ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" -ARG EXPOSE_PORTS="" +ARG EXPOSE_PORTS="6800" ARG PHP_VERSION="system" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" @@ -136,7 +136,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ -echo "" + echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -153,7 +153,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ -echo "" + echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \ @@ -252,6 +252,6 @@ VOLUME [ "/config","/data" ] EXPOSE ${SERVICE_PORT} ${ENV_PORTS} -CMD [ "tail", "-f", "/dev/null" ] +CMD [ "tail" ] ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ] HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ] diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index b1b0415..5e5a61b 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -12,8 +12,8 @@ # @@Description : Entrypoint file for aria2 # @@Changelog : New script # @@TODO : Better documentation -# @@Other : -# @@Resource : +# @@Other : +# @@Resource : # @@Terminal App : no # @@sudo/root : no # @@Template : other/docker-entrypoint @@ -81,7 +81,7 @@ SERVICE_UID="${SERVICE_UID:-0}" # set the user id SERVICE_GID="${SERVICE_GID:-0}" # set the group id # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # User and group in which the service switches to - IE: nginx,apache,mysql,postgres -SERVICE_USER="${SERVICE_USER:-$aria2}" # execute command as another user +SERVICE_USER="${SERVICE_USER:-aria2}" # execute command as another user SERVICE_GROUP="${SERVICE_GROUP:-aria2}" # Set the service group # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Secondary ports @@ -411,6 +411,18 @@ init) echo "Container has been Initialized" exit 0 ;; +tail) + shift 1 + case "$1" in + app) + shift 1 + tail -f /data/logs/*/*.log + ;; + *) + tail -f "${@:-/dev/null}" + ;; + esac + ;; logs) shift 1 case "$1" in