From 370da44744380834d796c80c2b5f294dc47654b4 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Sat, 23 Mar 2024 10:16:34 +0100
Subject: version 3.4.0.4

---
 docker-files/alpine.Dockerfile | 10 +++++++++-
 docker-files/ubuntu.Dockerfile | 14 +++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'docker-files')

diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index a7624b4b..f6b8982c 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -17,6 +17,11 @@ ARG PYTHON_VERSION=3.11
 # Base layer to be used for building dependencies and the release images
 FROM alpine:${IMAGE_VERSION} as base
 
+# Upgrade the system
+RUN apk update \
+  && apk upgrade --no-cache
+
+# Install the minimal set of packages
 RUN apk add --no-cache \
   python3 \
   curl \
@@ -52,6 +57,9 @@ RUN apk add --no-cache \
   libffi-dev \
   openssl-dev
 
+RUN python${PYTHON_VERSION} -m venv venv-build
+RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
+
 RUN python${PYTHON_VERSION} -m venv --without-pip venv
 
 COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@@ -120,4 +128,4 @@ FROM full as dev
 
 # Forward access and error logs to Docker's log collector
 RUN ln -sf /dev/stdout /tmp/glances-root.log \
-    && ln -sf /dev/stderr /var/log/error.log \
+    && ln -sf /dev/stderr /var/log/error.log
\ No newline at end of file
diff --git a/docker-files/ubuntu.Dockerfile b/docker-files/ubuntu.Dockerfile
index 6420dfed..4067d93d 100644
--- a/docker-files/ubuntu.Dockerfile
+++ b/docker-files/ubuntu.Dockerfile
@@ -36,17 +36,21 @@ FROM base as build
 ARG PYTHON_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Install build-time dependencies
+# Upgrade the system
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+  && apt-get upgrade -y
+
+# Install build-time dependencies
+RUN apt-get install -y --no-install-recommends \
     python3-dev \
     python3-venv \
     python3-pip \
     python3-wheel \
     libzmq5 \
     musl-dev \
-    build-essential \
-  && apt-get clean \
+    build-essential
+
+RUN apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
 RUN python${PYTHON_VERSION} -m venv --without-pip venv
@@ -115,4 +119,4 @@ FROM full as dev
 
 # Forward access and error logs to Docker's log collector
 RUN ln -sf /dev/stdout /tmp/glances-root.log \
-    && ln -sf /dev/stderr /var/log/error.log
\ No newline at end of file
+    && ln -sf /dev/stderr /var/log/error.log
-- 
cgit v1.2.3