Fixed #18 #23 in Dockerfile

Author: GVCoder09

Dockerfile

@@ -9,37 +9,18 @@ RUN apk add --no-cache curl jq && \
     tar --strip-components=1 -xf /tmp/nodpi.tar 
 
 # Preparing run script
-RUN cat << 'EOF' > ./nodpi
-#!/bin/sh
-
-# Get the absolute path of the script
-script_path="$(cd "$(dirname "$0")" && pwd)"
-
-# Default blacklists file
-blacklist_file="$script_path/blacklist.txt"
-
-# Optional directory containing additional blacklists
-blacklists_dir="/blacklists"
-
-# Temporary file for the combined blacklist
-tmp_file="/tmp/blacklist.txt"
-
-# Check if the directory with blacklists exists
-if [ -d "$blacklists_dir" ]; then
-   # Concatenate all blacklist files from the directory into the temporary file
-   cat "$blacklists_dir"/* > "$tmp_file" 2>/dev/null
-
-   # If the temporary file exists and is not empty, use it as the blacklist
-   if [ -f "$tmp_file" ] && [ -s "$tmp_file" ]; then
-       blacklist_file="$tmp_file"
-   fi
-fi
-
-# Run the main Python script with the specified blacklist file and pass all arguments
-python3 "$script_path/src/main.py" --host 0.0.0.0 --blacklist "$blacklist_file" "$@"
-
-EOF
-
+RUN echo '#!/bin/sh' > ./nodpi && \
+    echo 'script_path="$(cd "$(dirname "$0")" && pwd)"' >> ./nodpi && \
+    echo 'blacklist_file="$script_path/blacklist.txt"' >> ./nodpi && \
+    echo 'blacklists_dir="/blacklists"' >> ./nodpi && \
+    echo 'tmp_file="/tmp/blacklist.txt"' >> ./nodpi && \
+    echo 'if [ -d "$blacklists_dir" ]; then' >> ./nodpi && \
+    echo '  cat "$blacklists_dir"/* > "$tmp_file" 2>/dev/null' >> ./nodpi && \
+    echo '  if [ -f "$tmp_file" ] && [ -s "$tmp_file" ]; then' >> ./nodpi && \
+    echo '    blacklist_file="$tmp_file"' >> ./nodpi && \
+    echo '  fi' >> ./nodpi && \
+    echo 'fi' >> ./nodpi && \
+    echo 'python3 "$script_path/src/main.py" --host 0.0.0.0 --blacklist "$blacklist_file" "$@"' >> ./nodpi
 RUN chmod +x ./nodpi
 
 # App runner