nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-23 17:22:46 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2395 from nicolargo/issue2392

Browse Source 
Fix: missing `packaging` dependency with the new Dockerfile

Closes: 2392
This commit is contained in:
RazCrimson 2023-05-14 01:54:10 +05:30 committed by GitHub
commit 6bd7c067f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 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
##############################################################################

7
docker-files/ubuntu.Dockerfile
View File

@ -49,7 +49,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN python${PYTHON_VERSION} -m venv venv
RUN python${PYTHON_VERSION} -m venv --without-pip venv
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@ -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
##############################################################################