diff options
| author | nicolargo <nicolas@nicolargo.com> | 2023-05-20 15:59:41 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2023-05-20 15:59:41 +0200 |
| commit | f85ddbfee9edefadbcd06e84d18bbe07cf1f0e7f (patch) | |
| tree | 0a9f22d251c6b557e4ef9d59d6882ba5c60dfaf2 | |
| parent | 0095d8318526a7f950fc5ee0bd3ca32d25290477 (diff) | |
| parent | 8b7fdc84e151928525cfd646cbca4f19abc40971 (diff) | |
Merge branch 'Antiz96-develop' into develop
| -rw-r--r-- | .dockerignore | 3 | ||||
| -rwxr-xr-x | docker-bin.sh | 3 | ||||
| -rw-r--r-- | docker-files/alpine.Dockerfile | 4 | ||||
| -rw-r--r-- | docker-files/ubuntu.Dockerfile | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore index 7b9c92b8..45e2da8a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,3 +15,6 @@ # Include Config file !/docker-compose/glances.conf + +# Include Binary file +!/docker-bin.sh diff --git a/docker-bin.sh b/docker-bin.sh new file mode 100755 index 00000000..520e3e49 --- /dev/null +++ b/docker-bin.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/venv/bin/python3 -m glances $@ diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile index 2497a438..5ba23966 100644 --- a/docker-files/alpine.Dockerfile +++ b/docker-files/alpine.Dockerfile @@ -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 diff --git a/docker-files/ubuntu.Dockerfile b/docker-files/ubuntu.Dockerfile index 33771452..f719efed 100644 --- a/docker-files/ubuntu.Dockerfile +++ b/docker-files/ubuntu.Dockerfile @@ -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
\ No newline at end of file + && ln -sf /dev/stderr /var/log/error.log |