Version 3.2.6.4

nicolargo · May 26, 2022 · d0fde69 · d0fde69
1 parent 2d9bf17
commit d0fde69
Show file tree

Hide file tree

Showing 7 changed files with 311 additions and 277 deletions.
diff --git a/README.rst b/README.rst
@@ -211,7 +211,7 @@ Available versions on the Docker Hub repository:
 - *nicolargo/glances:latest-full* for a full Debian Glances image version with all dependencies
 - *nicolargo/glances:alpine-latest-full* for a full Alpine Glances image version with all dependencies
 
-You can also specify a version by replacing latest by 3.2.6.3 (for example).
+You can also specify a version by replacing latest by 3.2.6.4 (for example).
 
 Run last version of Glances container in *console mode*:
 

diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
@@ -54,6 +54,8 @@ RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requi
 FROM build as dev
 ARG PYTHON_VERSION
 
+COPY --from=remoteInstall /root/.local/bin /usr/local/bin/
+COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
 COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
 COPY . /glances
 COPY ./docker-compose/glances.conf /etc/glances.conf
@@ -85,8 +87,8 @@ COPY --from=remoteInstall /root/.local/bin /usr/local/bin/
 COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
 COPY ./docker-compose/glances.conf /etc/glances.conf
 
-# EXPOSE PORT (XMLRPC / WebUI)
-EXPOSE 61209 61208
+# EXPOSE PORT (XMLRPC)
+EXPOSE 61209
 
 # Define default command.
 CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT
@@ -100,3 +102,9 @@ ARG PYTHON_VERSION
 
 COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
 COPY ./docker-compose/glances.conf /etc/glances.conf
+
+# EXPOSE PORT (XMLRPC / WebUI)
+EXPOSE 61209 61208
+
+# Define default command.
+CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT
diff --git a/docker-files/debian.Dockerfile b/docker-files/debian.Dockerfile
@@ -51,6 +51,8 @@ RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requi
 FROM build as dev
 ARG PYTHON_VERSION
 
+COPY --from=remoteInstall /root/.local/bin /usr/local/bin/
+COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
 COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
 COPY . /glances
 COPY ./docker-compose/glances.conf /etc/glances.conf
@@ -84,8 +86,8 @@ COPY --from=remoteInstall /root/.local/bin /usr/local/bin/
 COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
 COPY ./docker-compose/glances.conf /etc/glances.conf
 
-# EXPOSE PORT (XMLRPC / WebUI)
-EXPOSE 61209 61208
+# EXPOSE PORT (XMLRPC)
+EXPOSE 61209
 
 # Define default command.
 CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT
@@ -99,3 +101,9 @@ ARG PYTHON_VERSION
 
 COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
 COPY ./docker-compose/glances.conf /etc/glances.conf
+
+# EXPOSE PORT (XMLRPC / WebUI)
+EXPOSE 61209 61208
+
+# Define default command.
+CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT