Skip to content

Commit

Permalink
Migration to Alpine 3.19 and update documentation regarding default g…
Browse files Browse the repository at this point in the history
…lances.conf file in Docker images
  • Loading branch information
nicolargo committed Jan 13, 2024
1 parent 07a81c5 commit 5cc18ad
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
8 changes: 5 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -221,22 +221,24 @@ Run last version of Glances container in *console mode*:
docker run --rm -e TZ="${TZ}" -v /var/run/docker.sock:/var/run/docker.sock:ro -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro --pid host --network host -it nicolargo/glances:latest-full
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).

Additionally, if you want to use your own glances.conf file, you can
create your own Dockerfile:

.. code-block:: console
FROM nicolargo/glances:latest
COPY glances.conf /etc/glances.conf
CMD python -m glances -C /etc/glances.conf $GLANCES_OPT
COPY glances.conf /root/.config/glances/glances.conf
CMD python -m glances -C /root/.config/glances/glances.conf $GLANCES_OPT
Alternatively, you can specify something along the same lines with
docker run options (notice the `GLANCES_OPT` environment
variable setting parameters for the glances startup command):

.. code-block:: console
docker run -e TZ="${TZ}" -v `pwd`/glances.conf:/etc/glances.conf -v /var/run/docker.sock:/var/run/docker.sock:ro -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro --pid host -e GLANCES_OPT="-C /etc/glances.conf" -it nicolargo/glances:latest-full
docker run -e TZ="${TZ}" -v `pwd`/glances.conf:/root/.config/glances/glances.conf -v /var/run/docker.sock:/var/run/docker.sock:ro -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro --pid host -e GLANCES_OPT="-C /etc/glances.conf" -it nicolargo/glances:latest-full
Where \`pwd\`/glances.conf is a local directory containing your glances.conf file.

Expand Down
5 changes: 3 additions & 2 deletions docker-files/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
# WARNING: the Alpine image version and Python version should be set.
# Alpine 3.18 tag is a link to the latest 3.18.x version.
# Be aware that if you change the Alpine version, you may have to change the Python version.
ARG IMAGE_VERSION=3.18

ARG IMAGE_VERSION=3.19
ARG PYTHON_VERSION=3.11

##############################################################################
Expand Down Expand Up @@ -84,7 +85,7 @@ RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VE
FROM base as release

# Copy source code and config file
COPY ./docker-compose/glances.conf /etc/glances.conf
COPY ./docker-compose/glances.conf /etc/glances/glances.conf
COPY /glances /app/glances

# Copy binary and update PATH
Expand Down
2 changes: 1 addition & 1 deletion docker-files/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VE
FROM base as release

# Copy Glances source code and config file
COPY ./docker-compose/glances.conf /etc/glances.conf
COPY ./docker-compose/glances.conf /etc/glances/glances.conf
COPY /glances /app/glances

# Copy binary and update PATH
Expand Down

0 comments on commit 5cc18ad

Please sign in to comment.