From 70e7c997a186dbff7cbdccf3525693af25737ad2 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 20 Aug 2020 15:48:38 +0200 Subject: [PATCH] Update DockerFile --- docker-files/devel-alpine/Dockerfile | 2 +- docker-files/devel-arm/Dockerfile | 32 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docker-files/devel-alpine/Dockerfile b/docker-files/devel-alpine/Dockerfile index 57646559..ae278b10 100644 --- a/docker-files/devel-alpine/Dockerfile +++ b/docker-files/devel-alpine/Dockerfile @@ -8,7 +8,7 @@ FROM alpine # Install Glances (develop branch) -RUN apk add python py2-psutil py2-bottle +RUN apk add python py3-psutil py3-bottle RUN apk add git RUN git clone -b develop https://github.com/nicolargo/glances.git diff --git a/docker-files/devel-arm/Dockerfile b/docker-files/devel-arm/Dockerfile index c21ec81b..bb4265ab 100644 --- a/docker-files/devel-arm/Dockerfile +++ b/docker-files/devel-arm/Dockerfile @@ -3,25 +3,25 @@ # # https://github.com/nicolargo/glances # +# Thanks to @Overbryd for the Dockerfile +# Source: https://github.com/nicolargo/glances/issues/1419#issuecomment-677644194 +# -# Pull base image. -FROM python:2.7-alpine +FROM python:3.8-slim-buster -# Install Glances (develop branch) -RUN apk add --no-cache --virtual .build_deps \ - gcc \ - musl-dev \ - linux-headers \ - git \ - && git clone -b develop https://github.com/nicolargo/glances.git \ - && pip install --no-cache-dir -r glances/requirements.txt bottle \ - && apk del .build_deps +RUN apt-get update \ + && apt-get install -y \ + gcc \ + python3-dev + +ARG GLANCES_VERSION=3.1.5 + +RUN pip install \ + glances[web,ip,folders,docker,cpuinfo,action]==${GLANCES_VERSION} -# Define working directory. WORKDIR /glances -# EXPOSE PORT (For Web UI & XMLRPC) -EXPOSE 61208 61209 +# expose xmlrpc & webui +EXPOSE 61209 61208 -# Define default command. -CMD python -m glances -C /glances/conf/glances.conf $GLANCES_OPT +CMD python -m glances -C /glances/conf/glances.conf $GLANCES_OPT \ No newline at end of file