mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Antiz96-develop' into develop

This commit is contained in:
nicolargo 2023-05-20 15:59:41 +02:00
parent 0095d83185 8b7fdc84e1
commit f85ddbfee9
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.dockerignore
View File

@ -15,3 +15,6 @@
# Include Config file
!/docker-compose/glances.conf
# Include Binary file
!/docker-bin.sh

3
docker-bin.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
/venv/bin/python3 -m glances $@

4
docker-files/alpine.Dockerfile
View File

@ -86,6 +86,10 @@ FROM base as release
COPY ./docker-compose/glances.conf /etc/glances.conf
COPY /glances /app/glances
# Copy binary and update PATH
COPY docker-bin.sh /usr/local/bin/glances
ENV PATH="/venv/bin:$PATH"
# EXPOSE PORT (XMLRPC / WebUI)
EXPOSE 61209 61208

6
docker-files/ubuntu.Dockerfile
View File

@ -80,6 +80,10 @@ FROM base as release
COPY ./docker-compose/glances.conf /etc/glances.conf
COPY /glances /app/glances
# Copy binary and update PATH
COPY docker-bin.sh /usr/local/bin/glances
ENV PATH="/venv/bin:$PATH"
# EXPOSE PORT (XMLRPC / WebUI)
EXPOSE 61209 61208
@ -110,4 +114,4 @@ FROM full as dev
# Forward access and error logs to Docker's log collector
RUN ln -sf /dev/stdout /tmp/glances-root.log \
&& ln -sf /dev/stderr /var/log/error.log
&& ln -sf /dev/stderr /var/log/error.log