From de69635d41efa38428e0779e2467632d2cafdede Mon Sep 17 00:00:00 2001
From: nicolargo <nicolashennion@gmail.com>
Date: Mon, 29 Apr 2024 18:17:32 +0200
Subject: [PATCH] Upgrade Ubuntu Docker image to 24.04

---
 docker-compose/glances.conf    |  2 +-
 docker-files/alpine.Dockerfile |  4 ++--
 docker-files/ubuntu.Dockerfile | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf
index 24868117..74362ea9 100755
--- a/docker-compose/glances.conf
+++ b/docker-compose/glances.conf
@@ -399,7 +399,7 @@ refresh=30
 # Set the default timeout (in second) for a scan (can be overwritten in the scan list)
 timeout=3
 # If port_default_gateway is True, add the default gateway on top of the scan list
-port_default_gateway=True
+port_default_gateway=False
 #
 # Define the scan list (1 < x < 255)
 # port_x_host (name or IP) is mandatory
diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index f63161bc..14e23c13 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -69,7 +69,7 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
 FROM build as buildMinimal
 
 RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
-    # Note: requirements.txt is include by dep
+    -r requirements.txt \
     -r docker-requirements.txt \
     -r webui-requirements.txt
 
@@ -83,7 +83,7 @@ ARG CASS_DRIVER_NO_CYTHON=1
 ARG CARGO_NET_GIT_FETCH_WITH_CLI=true
 
 RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
-    # Note: requirements.txt is include by dep
+    -r requirements.txt \
     -r optional-requirements.txt
 
 ##############################################################################
diff --git a/docker-files/ubuntu.Dockerfile b/docker-files/ubuntu.Dockerfile
index 19bcc39c..0fb38c4c 100644
--- a/docker-files/ubuntu.Dockerfile
+++ b/docker-files/ubuntu.Dockerfile
@@ -5,11 +5,11 @@
 #
 
 # WARNING: the versions should be set.
-# Ex: Python 3.10 for Ubuntu 22.04
+# Ex: Python 3.12 for Ubuntu 24.04
 # Note: ENV is for future running containers. ARG for building your Docker image.
 
-ARG IMAGE_VERSION=23.10
-ARG PYTHON_VERSION=3.11
+ARG IMAGE_VERSION=24.04
+ARG PYTHON_VERSION=3.12
 
 ##############################################################################
 # Base layer to be used for building dependencies and the release images
@@ -53,7 +53,7 @@ RUN apt-get install -y --no-install-recommends \
 RUN apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN python${PYTHON_VERSION} -m venv --without-pip venv
+RUN python3 -m venv --without-pip venv
 
 COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
 
@@ -61,8 +61,8 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
 # BUILD: Install the minimal image deps
 FROM build as buildMinimal
 
-RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
-    # Note: requirements.txt is include by dep
+RUN python3 -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
+    -r requirements.txt \
     -r docker-requirements.txt \
     -r webui-requirements.txt
 
@@ -70,8 +70,8 @@ RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VE
 # BUILD: Install all the deps
 FROM build as buildFull
 
-RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
-    # Note: requirements.txt is include by dep
+RUN python3 -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
+    -r requirements.txt \
     -r optional-requirements.txt
 
 ##############################################################################