diff options
| -rw-r--r-- | README.rst | 7 | ||||
| -rw-r--r-- | docker-files/devel-arm/Dockerfile | 4 | ||||
| -rw-r--r-- | docker-files/devel/Dockerfile | 28 | ||||
| -rw-r--r-- | requirements.txt | 2 |
4 files changed, 32 insertions, 9 deletions
@@ -161,6 +161,13 @@ If you need to install Glances in a specific user location, use: export PYTHONUSERBASE=~/mylocalpath pip install --user glances +The current develop branch is also published to the test.pypi.org package index. +If you want to test the develop version, enter: + +.. code-block:: console + + pip install -i https://test.pypi.org/simple/ Glances + Docker: the funny way --------------------- diff --git a/docker-files/devel-arm/Dockerfile b/docker-files/devel-arm/Dockerfile index bb4265ab..f6e0f440 100644 --- a/docker-files/devel-arm/Dockerfile +++ b/docker-files/devel-arm/Dockerfile @@ -14,10 +14,8 @@ RUN apt-get update \ gcc \ python3-dev -ARG GLANCES_VERSION=3.1.5 - RUN pip install \ - glances[web,ip,folders,docker,cpuinfo,action]==${GLANCES_VERSION} + glances[web,ip,folders,docker,cpuinfo,action] WORKDIR /glances diff --git a/docker-files/devel/Dockerfile b/docker-files/devel/Dockerfile index a0d31190..011e765c 100644 --- a/docker-files/devel/Dockerfile +++ b/docker-files/devel/Dockerfile @@ -1,5 +1,5 @@ # -# Glances Dockerfile based on Ubuntu OS +# Glances Dockerfile (based on Ubuntu) # # https://github.com/nicolargo/glances # @@ -7,10 +7,28 @@ # Pull base image. FROM ubuntu:20.04 -# Install Glances (develop branch) -RUN apt-get update && apt-get -y install curl iputils-ping && rm -rf /var/lib/apt/lists/* -RUN curl -L https://raw.githubusercontent.com/nicolargo/glancesautoinstall/master/install-develop.sh | /bin/bash && rm -rf /var/lib/apt/lists/* +# Install package +# Must used calibre package to be able to run external module +ENV DEBIAN_FRONTEND noninteractive +RUN \ + apt-get update && \ + apt-get install -y \ + curl \ + gcc \ + lm-sensors \ + wireless-tools \ + iputils-ping \ + python3-pip \ + python3-dev && \ + rm -rf /var/lib/apt/lists/* + +## Instal glances +RUN \ + pip3 install --upgrade pip && \ + pip3 install setuptools && \ + pip3 install glances[action,batinfo,browser,cpuinfo,docker,export,folders,gpu,graph,ip,raid,snmp,web,wifi] && \ + pip3 install --upgrade -i https://test.pypi.org/simple/ Glances # Define working directory. WORKDIR /glances @@ -22,4 +40,4 @@ EXPOSE 61209 EXPOSE 61208 # Define default command. -CMD python -m glances -C /glances/conf/glances.conf $GLANCES_OPT +CMD python3 -m glances -C /glances/conf/glances.conf $GLANCES_OPT diff --git a/requirements.txt b/requirements.txt index 92e1d160..8cd54d10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -psutil==5.7.0 +psutil==5.7.2 future |