summaryrefslogtreecommitdiffstats
path: root/docker-files
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2024-05-12 09:52:17 +0200
committernicolargo <nicolashennion@gmail.com>2024-05-12 09:52:17 +0200
commite9abf1c9af0030a62938d62535c6b90dffe93fc2 (patch)
tree152b72bc6bfe1347953beaa10686b5be5bfce118 /docker-files
parent364a3ef88496f91a0e71c83b1a8fa50af2cf5b5b (diff)
parentee826a1e678c63ca509326ca2dbdc72af7d88151 (diff)
ORJson is not mandatory
Diffstat (limited to 'docker-files')
-rw-r--r--docker-files/alpine.Dockerfile8
-rw-r--r--docker-files/ubuntu.Dockerfile5
2 files changed, 13 insertions, 0 deletions
diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index 35ff3dc5..8f40cc20 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -61,6 +61,9 @@ RUN apk add --no-cache \
RUN python${PYTHON_VERSION} -m venv venv-build
RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
+RUN python${PYTHON_VERSION} -m venv venv-build
+RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
+
RUN python${PYTHON_VERSION} -m venv --without-pip venv
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@@ -105,6 +108,11 @@ COPY docker-bin.sh /usr/local/bin/glances
RUN chmod a+x /usr/local/bin/glances
ENV PATH="/venv/bin:$PATH"
+# Copy binary and update PATH
+COPY docker-bin.sh /usr/local/bin/glances
+RUN chmod a+x /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 a44edbe2..3a5ccc4c 100644
--- a/docker-files/ubuntu.Dockerfile
+++ b/docker-files/ubuntu.Dockerfile
@@ -92,6 +92,11 @@ COPY docker-bin.sh /usr/local/bin/glances
RUN chmod a+x /usr/local/bin/glances
ENV PATH="/venv/bin:$PATH"
+# Copy binary and update PATH
+COPY docker-bin.sh /usr/local/bin/glances
+RUN chmod a+x /usr/local/bin/glances
+ENV PATH="/venv/bin:$PATH"
+
# EXPOSE PORT (XMLRPC / WebUI)
EXPOSE 61209 61208