summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume L <guillaume.lamirand@gmail.com>2020-05-17 10:56:09 +0200
committerGitHub <noreply@github.com>2020-05-17 10:56:09 +0200
commit07d3b6defcab838c137cad1392dfe9dcfcdad278 (patch)
treefd4099b899404e6e4ac346735a6bcbe061ba97c7
parent0c9a8acc650205a5a07d5ad3ce4ba2af489ee045 (diff)
Update master dockerfile for Ubuntu 20.04
-rw-r--r--docker-files/master/Dockerfile28
1 files changed, 23 insertions, 5 deletions
diff --git a/docker-files/master/Dockerfile b/docker-files/master/Dockerfile
index db42dec4..b2c874c1 100644
--- a/docker-files/master/Dockerfile
+++ b/docker-files/master/Dockerfile
@@ -5,12 +5,30 @@
#
# Pull base image.
-FROM ubuntu
+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.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 \
+ glances[action,batinfo,browser,cpuinfo,docker,export,folders,gpu,graph,ip,raid,snmp,web,wifi] \
+ 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