diff options
author | nicolargo <nicolas@nicolargo.com> | 2022-07-28 18:10:35 +0200 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2022-07-28 18:10:35 +0200 |
commit | 8e443d342cc7b8445d4a60314c3f642e34ce6608 (patch) | |
tree | 276bde4ac532d799dd0c7acb0b59cd2e34d5008e | |
parent | 709b4e904d831ab44e38dcf98804c63953d450b5 (diff) | |
parent | d0fde6904c7e1668929862435f9124d97d74ea5b (diff) |
Resolv conflict from masterv3.2.7
-rw-r--r-- | README.rst | 2 | ||||
-rw-r--r-- | docker-files/alpine.Dockerfile | 12 | ||||
-rw-r--r-- | docker-files/debian.Dockerfile | 12 | ||||
-rw-r--r-- | docs/api.rst | 2 |
4 files changed, 22 insertions, 6 deletions
@@ -205,7 +205,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 index 01052fd0..048c7fb4 100644 --- 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 index ef8f963e..35163854 100644 --- 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 diff --git a/docs/api.rst b/docs/api.rst index 16f901a2..734c8a25 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -137,7 +137,7 @@ Get plugin stats:: "irq": 0.0, "nice": 0.0, "soft_interrupts": 0, - "softirq": 0.0, + "softirq": 0.2, "steal": 0.0, "syscalls": 0, "system": 2.2, |