Update Dockerfile to include python-is-python3 and enhance entrypoint script for conditional package list updates based on network availability.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -24,14 +24,13 @@ RUN apt update && apt install -y \
|
||||
# Packet analysis tools
|
||||
tshark \
|
||||
# Programming languages and runtimes
|
||||
python3 python3-pip python3-venv python3-dev \
|
||||
python3 python3-pip python3-venv python3-dev python-is-python3 \
|
||||
# Development tools
|
||||
software-properties-common build-essential \
|
||||
# Remote access
|
||||
openssh-server \
|
||||
# Localization
|
||||
locales
|
||||
# Note: Keeping apt cache for dev convenience
|
||||
|
||||
# Install Node.js using official NodeSource repository
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - && \
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# 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"
|
||||
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 "Warning: apt update failed despite network connectivity"
|
||||
echo "Falling back to cached package lists"
|
||||
echo "No network connectivity detected, using cached package lists"
|
||||
fi
|
||||
else
|
||||
echo "No network connectivity detected, using cached package lists"
|
||||
fi
|
||||
|
||||
# Global variable to track background processes
|
||||
|
||||
Reference in New Issue
Block a user