From ef7a68abeab7b4bfab045cca30ab4e8d7f4c8ee3 Mon Sep 17 00:00:00 2001
From: TorotinJenkins <svyatdemidov@gmail.com>
Date: Wed, 25 Jun 2025 14:55:02 +0300
Subject: [PATCH] DockerInit rewritten, bash added to dockerfile at build stage

---
 DockerInit.sh | 194 ++++++++++++--------------------------------------
 Dockerfile    |   3 +-
 2 files changed, 49 insertions(+), 148 deletions(-)

diff --git a/DockerInit.sh b/DockerInit.sh
index 2cc36fcd..b22c6059 100755
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -1,155 +1,55 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
+#!/bin/sh
+# POSIX-compatible script to download Xray binary and GeoIP/GeoSite databases
 
-# ------------------------------------------------------------------------------
-# DockerInit.sh — download and prepare Xray binaries and geolocation databases
-# ------------------------------------------------------------------------------
+set -eu
 
-# Xray version
-readonly XRAY_VERSION="v25.5.16"
+XRAY_VERSION="v25.6.8"
+BASE_URL="https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}"
+DAT_DIR="build/bin"
+ARCH="${1:-amd64}"  # Default to amd64 if not provided
 
-# URL template for downloading Xray
-readonly XRAY_URL_TEMPLATE="https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}/Xray-linux-%s.zip"
+# Map architecture
+case "$ARCH" in
+    amd64)    ARCH_SUFFIX="64";        FNAME="amd64"     ;;
+    i386)     ARCH_SUFFIX="32";        FNAME="i386"      ;;
+    armv8|arm64|aarch64) ARCH_SUFFIX="arm64-v8a"; FNAME="arm64" ;;
+    armv7|arm|arm32)     ARCH_SUFFIX="arm32-v7a"; FNAME="arm32" ;;
+    armv6)    ARCH_SUFFIX="arm32-v6";  FNAME="armv6"     ;;
+    *)        ARCH_SUFFIX="64";        FNAME="amd64"     ;;
+esac
 
-# Directories
-readonly BUILD_DIR="build/bin"
-readonly ROOT_DIR="$(pwd)"
+echo "Selected architecture: $ARCH → $ARCH_SUFFIX → $FNAME"
 
-# Check for required utilities
-check_dependencies() {
-    local deps=(wget unzip)
-    for cmd in "${deps[@]}"; do
-        if ! command -v "$cmd" &> /dev/null; then
-            echo "Error: Required utility '$cmd' is not installed. Please install it and try again." >&2
-            exit 1
-        fi
-    done
+# Create directory
+mkdir -p "$DAT_DIR"
+cd "$DAT_DIR"
+
+# Download and unpack Xray
+XRAY_ZIP="Xray-linux-${ARCH_SUFFIX}.zip"
+echo "Downloading Xray: $XRAY_ZIP"
+wget -q "${BASE_URL}/${XRAY_ZIP}"
+unzip -q "$XRAY_ZIP"
+rm -f "$XRAY_ZIP" geoip.dat geosite.dat
+mv xray "xray-linux-${FNAME}"
+chmod +x "xray-linux-${FNAME}"
+echo "Xray extracted and renamed"
+
+# Download primary databases
+echo "Downloading official geoip/geosite..."
+wget -q https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+wget -q https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+
+# Download region-specific datasets
+download_variant() {
+    REGION="$1"
+    BASE_URL="$2"
+    echo "Downloading $REGION GeoIP/GeoSite..."
+    wget -q -O "geoip_${REGION}.dat"    "${BASE_URL}/geoip.dat"
+    wget -q -O "geosite_${REGION}.dat"  "${BASE_URL}/geosite.dat"
 }
 
-# Print usage help
-usage() {
-    cat <<EOF
-Usage: $0 <architecture>
+download_variant "IR" "https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download"
+download_variant "RU" "https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download"
 
-Supported architectures:
-  amd64    ? 64-bit x86
-  i386     ? 32-bit x86
-  armv8    ? ARM64-v8a (also accepts arm64, aarch64)
-  armv7    ? ARM32-v7a (also accepts arm, arm32)
-  armv6    ? ARM32-v6
-
-If no argument is provided or the argument is not recognized, 'amd64' will be used by default.
-
-Example:
-  $0 armv7
-EOF
-    exit 1
-}
-
-# Determine ARCH and FNAME based on input argument
-detect_arch() {
-    local input="$1"
-
-    case "$input" in
-        amd64)
-            ARCH="64"
-            FNAME="amd64"
-            ;;
-        i386)
-            ARCH="32"
-            FNAME="i386"
-            ;;
-        armv8 | arm64 | aarch64)
-            ARCH="arm64-v8a"
-            FNAME="arm64"
-            ;;
-        armv7 | arm | arm32)
-            ARCH="arm32-v7a"
-            FNAME="arm32"
-            ;;
-        armv6)
-            ARCH="arm32-v6"
-            FNAME="armv6"
-            ;;
-        "")
-            # If argument is empty, default to amd64
-            ARCH="64"
-            FNAME="amd64"
-            ;;
-        *)
-            echo "Warning: Architecture '$input' not recognized. Defaulting to 'amd64'." >&2
-            ARCH="64"
-            FNAME="amd64"
-            ;;
-    esac
-}
-
-# Generic function to download a file by URL (with error handling)
-download_file() {
-    local url="$1"
-    local output="$2"
-
-    echo "Downloading: $url"
-    if ! wget -q -O "$output" "$url"; then
-        echo "Error: Failed to download '$url'" >&2
-        exit 1
-    fi
-}
-
-# Main function: create directory, download and unpack Xray, then geolocation databases
-main() {
-    # Check dependencies
-    check_dependencies
-
-    # Get architecture from argument
-    local ARCH_ARG="${1-}"
-    detect_arch "$ARCH_ARG"
-
-    # Construct URL for Xray download
-    local xray_url
-    printf -v xray_url "$XRAY_URL_TEMPLATE" "$ARCH"
-
-    # Create build directory
-    echo "Creating directory: $BUILD_DIR"
-    mkdir -p "$BUILD_DIR"
-    cd "$BUILD_DIR" || exit 1
-
-    # Download and unpack Xray
-    local xray_zip="Xray-linux-${ARCH}.zip"
-    download_file "$xray_url" "$xray_zip"
-    echo "Unpacking $xray_zip"
-    unzip -q "$xray_zip"
-    rm -f "$xray_zip" geoip.dat geosite.dat
-
-    # Rename binary according to target architecture
-    mv xray "xray-linux-${FNAME}"
-    chmod +x "xray-linux-${FNAME}"
-
-    # Return to project root
-    cd "$ROOT_DIR" || exit 1
-
-    # Download standard GeoIP and GeoSite databases
-    echo "Downloading default GeoIP and GeoSite databases"
-    download_file "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" "geoip.dat"
-    download_file "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" "geosite.dat"
-
-    # Download alternative GeoIP/GeoSite for Iran (IR) and Russia (RU)
-    echo "Downloading alternative GeoIP/GeoSite for Iran"
-    download_file "https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat" "geoip_IR.dat"
-    download_file "https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat" "geosite_IR.dat"
-
-    echo "Downloading alternative GeoIP/GeoSite for Russia"
-    download_file "https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geoip.dat" "geoip_RU.dat"
-    download_file "https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geosite.dat" "geosite_RU.dat"
-
-    echo "Done."
-}
-
-# If -h or --help is passed, show usage
-if [[ "${1-}" == "-h" || "${1-}" == "--help" ]]; then
-    usage
-fi
-
-# Run main with the provided argument (if any)
-main "${1-}"
+echo "All files downloaded successfully."
+cd ../../
diff --git a/Dockerfile b/Dockerfile
index 650b5c15..9614bcf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ RUN apk --no-cache --update add \
   build-base \
   gcc \
   wget \
-  unzip
+  unzip \
+  bash
 
 COPY . .