diff --git a/Dockerfile b/Dockerfile index 15b3733..66c9313 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN set -eu && \ COPY --chmod=755 ./src /run/ COPY --chmod=755 ./web /var/www/ COPY --chmod=755 --from=builder /qemu-host.bin /run/host.bin -COPY --chmod=744 ./web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf +COPY --chmod=744 ./web/conf/nginx.conf /etc/nginx/default.conf ADD --chmod=775 https://raw.githubusercontent.com/sud0woodo/patology/refs/heads/main/patology.py /run/extract.py VOLUME /storage diff --git a/src/network.sh b/src/network.sh index 61714bf..5d50e0a 100644 --- a/src/network.sh +++ b/src/network.sh @@ -173,7 +173,7 @@ getUserPorts() { getHostPorts() { - local list=$1 + local list="$1" [ -z "$list" ] && echo "" && return 0 diff --git a/src/reset.sh b/src/reset.sh index bef5e47..ec9dca9 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -202,19 +202,22 @@ addPackage() { return 0 } +: "${WEB_PORT:="5000"}" # Webserver port + cp -r /var/www/* /run/shm html "Starting $APP for Docker..." if [[ "${WEB:-}" != [Nn]* ]]; then - + + mkdir -p /etc/nginx/sites-enabled + cp /etc/nginx/default.conf /etc/nginx/sites-enabled/web.conf + + sed -i "s/listen 5000 default_server;/listen $WEB_PORT default_server;/g" /etc/nginx/sites-enabled/web.conf + # shellcheck disable=SC2143 if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then - sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf - - else - - sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf + sed -i "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf fi