diff options
| author | nicolargo <nicolas@nicolargo.com> | 2023-05-20 16:09:27 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2023-05-20 16:09:27 +0200 |
| commit | 40fd7fe7c7e8c2ea42ddc9aee7251b5a5dc130ec (patch) | |
| tree | 1b8a0a60cdcbd2336acc266ca3882dd44828aa27 | |
| parent | 87b8300cc6be6dd2e577a7e8b371b0a5c72a8b64 (diff) | |
Add glances binary to '/usr/local/bin' + Update ENV PATH to include '/venv/bin' in Dockerfiles - Reported from devel branch #2419
| -rw-r--r-- | .dockerignore | 3 | ||||
| -rw-r--r-- | docker-bin.sh | 3 | ||||
| -rw-r--r-- | docker-files/alpine.Dockerfile | 4 | ||||
| -rw-r--r-- | docker-files/ubuntu.Dockerfile | 4 |
4 files changed, 14 insertions, 0 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 100644 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..96abc88f 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 |