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

fix: Dockerfile - missing `packaging` dependency 

cause: venv fallbacks on system packages that only exist during build time

issue from: 4bf16e95
This commit is contained in:
Bharath Vignesh J K 2023-05-14 00:39:40 +05:30
parent 13f6db08bc
commit e90d33eca6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker-files/alpine.Dockerfile
View File

@ -50,7 +50,7 @@ RUN apk add --no-cache \
libffi-dev \
openssl-dev
RUN python${PYTHON_VERSION} -m venv --system-site-packages --without-pip venv
RUN python${PYTHON_VERSION} -m venv --without-pip venv
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@ -58,7 +58,7 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
# BUILD: Install the minimal image deps
FROM build as buildMinimal
RUN /venv/bin/python3 -m pip install --no-cache-dir \
RUN python${PYTHON_VERSION} -m pip install --target=/venv/lib/python${PYTHON_VERSION}/site-packages \
# Note: requirements.txt is include by dep
-r docker-requirements.txt \
-r webui-requirements.txt
@ -72,7 +72,8 @@ ARG CASS_DRIVER_NO_CYTHON=1
# See issue 2368
ARG CARGO_NET_GIT_FETCH_WITH_CLI=true
RUN /venv/bin/python3 -m pip install --no-cache-dir \
RUN python${PYTHON_VERSION} -m pip install --target=/venv/lib/python${PYTHON_VERSION}/site-packages \
# Note: requirements.txt is include by dep
-r optional-requirements.txt
##############################################################################

5
docker-files/ubuntu.Dockerfile
View File

@ -57,7 +57,7 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
# BUILD: Install the minimal image deps
FROM build as buildMinimal
RUN /venv/bin/python3 -m pip install --no-cache-dir \
RUN python${PYTHON_VERSION} -m pip install --target=/venv/lib/python${PYTHON_VERSION}/site-packages \
# Note: requirements.txt is include by dep
-r docker-requirements.txt \
-r webui-requirements.txt
@ -66,7 +66,8 @@ RUN /venv/bin/python3 -m pip install --no-cache-dir \
# BUILD: Install all the deps
FROM build as buildFull
RUN /venv/bin/python3 -m pip install --no-cache-dir \
RUN python${PYTHON_VERSION} -m pip install --target=/venv/lib/python${PYTHON_VERSION}/site-packages \
# Note: requirements.txt is include by dep
-r optional-requirements.txt
##############################################################################