Streamlined the entrypoint script.
This commit is contained in:
@@ -1,58 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Configure Chinese mirrors if USE_CHINA_MIRRORS is set
|
||||
configure_china_mirrors() {
|
||||
if [[ "$USE_CHINA_MIRRORS" == "1" || "${USE_CHINA_MIRRORS,,}" == "true" ]]; then
|
||||
echo "Configuring Chinese mirrors for apt and pip..."
|
||||
|
||||
# Replace Ubuntu sources
|
||||
if [[ -f /etc/apt/sources.list.d/ubuntu.sources ]]; then
|
||||
sudo sed -i 's|http://archive.ubuntu.com/ubuntu/|https://mirrors.tuna.tsinghua.edu.cn/ubuntu/|g' /etc/apt/sources.list.d/ubuntu.sources
|
||||
sudo sed -i 's|http://security.ubuntu.com/ubuntu/|https://mirrors.tuna.tsinghua.edu.cn/ubuntu/|g' /etc/apt/sources.list.d/ubuntu.sources
|
||||
echo "Updated Ubuntu apt sources to use Chinese mirrors"
|
||||
fi
|
||||
|
||||
# Configure npm registry to use Chinese mirror (npmmirror.com is the recommended mirror)
|
||||
if command -v npm &> /dev/null; then
|
||||
npm config set registry https://registry.npmmirror.com/
|
||||
echo "Configured npm registry to use Chinese mirror (registry.npmmirror.com)"
|
||||
fi
|
||||
# Also set system-wide npm config for all users
|
||||
sudo mkdir -p /etc/npm
|
||||
echo "registry=https://registry.npmmirror.com/" | sudo tee /etc/npm/npmrc > /dev/null
|
||||
# Set for root user as well (for when npm is installed later)
|
||||
sudo mkdir -p /root/.npm
|
||||
echo "registry=https://registry.npmmirror.com/" | sudo tee /root/.npmrc > /dev/null
|
||||
echo "Configured npm registry to use Chinese mirror (registry.npmmirror.com)"
|
||||
|
||||
# Configure pip to use Chinese mirrors
|
||||
sudo mkdir -p /etc/pip
|
||||
echo "[global]
|
||||
index-url = https://pypi.tuna.tsinghua.edu.cn/simple
|
||||
trusted-host = pypi.tuna.tsinghua.edu.cn" | sudo tee /etc/pip/pip.conf > /dev/null
|
||||
echo "Configured pip to use Chinese mirrors"
|
||||
|
||||
echo "Chinese mirrors configuration completed"
|
||||
fi
|
||||
}
|
||||
|
||||
# Run mirror configuration early, before any apt/pip operations
|
||||
configure_china_mirrors
|
||||
if [[ "$USE_CHINA_MIRRORS" == "1" || "${USE_CHINA_MIRRORS,,}" == "true" ]]; then
|
||||
/bin/configure-china-mirrors
|
||||
fi
|
||||
|
||||
# Update apt package cache if requested
|
||||
if [[ "$UPDATE_APT" == "1" || "${UPDATE_APT,,}" == "true" ]]; then
|
||||
# Gracefully update package lists if network is available
|
||||
echo "Checking network connectivity..."
|
||||
if ping -c 1 -W 5 8.8.8.8 >/dev/null 2>&1 || ping -c 1 -W 5 1.1.1.1 >/dev/null 2>&1; then
|
||||
echo "Network detected, refreshing package lists..."
|
||||
if sudo apt update; then
|
||||
echo "Package lists updated successfully"
|
||||
else
|
||||
echo "Warning: apt update failed despite network connectivity"
|
||||
echo "Falling back to cached package lists"
|
||||
fi
|
||||
else
|
||||
echo "No network connectivity detected, using cached package lists"
|
||||
fi
|
||||
/bin/update-apt-cache
|
||||
fi
|
||||
|
||||
# Global variables to track background processes
|
||||
@@ -112,12 +67,8 @@ trap 'term_handler' SIGTERM SIGINT SIGQUIT
|
||||
# Test signal handling is working
|
||||
echo "Signal handlers registered. Testing with kill -0..."
|
||||
|
||||
# setup home directory for the current user. It is useful for attaching vscode with container.
|
||||
user_name=$(whoami)
|
||||
user_home="/home/$user_name"
|
||||
sudo mkdir -p "$user_home"
|
||||
sudo chown -R "$(id -u):$(id -g)" "$user_home"
|
||||
cp -r /etc/skel/. "$user_home" 2>/dev/null || true
|
||||
# Setup home directory for the current user
|
||||
/bin/setup-user-home
|
||||
|
||||
if [[ $LOG_FILE != "/dev/null" ]]; then
|
||||
sudo touch "$LOG_FILE"
|
||||
|
||||
Reference in New Issue
Block a user