Skip to content

Commit

Permalink
version 3.4.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolargo committed Mar 23, 2024
1 parent b976062 commit 370da44
Show file tree
Hide file tree
Showing 13 changed files with 640 additions and 632 deletions.
6 changes: 6 additions & 0 deletions NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Glances changelog
==============================================================================

===============
Version 3.4.0.4
===============

Cuber security patch (update some deps in the WebUI and Docker image)

===============
Version 3.4.0.3
===============
Expand Down
4 changes: 2 additions & 2 deletions conf/glances.conf
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ tx_careful=70
tx_warning=80
tx_critical=90
# Define the list of hidden network interfaces (comma-separated regexp)
#hide=docker.*,lo
hide=docker.*,lo
# Define the list of wireless network interfaces to be show (comma-separated)
#show=docker.*
# WLAN 0 alias
Expand Down Expand Up @@ -465,7 +465,7 @@ path=/tmp
# It is possible to generate the graphs automatically by setting the
# generate_every to a non zero value corresponding to the seconds between
# two generation. Set it to 0 to disable graph auto generation.
generate_every=60
generate_every=0
# See following configuration keys definitions in the Pygal lib documentation
# http://pygal.org/en/stable/documentation/index.html
width=800
Expand Down
10 changes: 9 additions & 1 deletion docker-files/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 ./
Expand Down Expand Up @@ -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
14 changes: 9 additions & 5 deletions docker-files/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
&& ln -sf /dev/stderr /var/log/error.log
4 changes: 2 additions & 2 deletions docker-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ podman; python_version >= "3.6"
packaging; python_version >= "3.7"
python-dateutil
six
urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392
requests # See issue - https://github.com/nicolargo/glances/issues/2233
urllib3
requests
Loading

0 comments on commit 370da44

Please sign in to comment.