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

Use a venv-build environment for Alpine image

This commit is contained in:
nicolargo 2024-03-04 11:24:51 +01:00
parent a71f2b6367
commit 0b7e293476
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker-files/alpine.Dockerfile
View File

@ -52,7 +52,8 @@ RUN apk add --no-cache \
libffi-dev \ libffi-dev \
openssl-dev openssl-dev
RUN python${PYTHON_VERSION} -m pip --version 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 RUN python${PYTHON_VERSION} -m venv --without-pip venv
@ -62,7 +63,7 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
# BUILD: Install the minimal image deps # BUILD: Install the minimal image deps
FROM build as buildMinimal FROM build as buildMinimal
RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \ RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
# Note: requirements.txt is include by dep # Note: requirements.txt is include by dep
-r docker-requirements.txt \ -r docker-requirements.txt \
-r webui-requirements.txt -r webui-requirements.txt
@ -76,7 +77,7 @@ ARG CASS_DRIVER_NO_CYTHON=1
# See issue 2368 # See issue 2368
ARG CARGO_NET_GIT_FETCH_WITH_CLI=true ARG CARGO_NET_GIT_FETCH_WITH_CLI=true
RUN python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \ RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --target="/venv/lib/python${PYTHON_VERSION}/site-packages" \
# Note: requirements.txt is include by dep # Note: requirements.txt is include by dep
-r optional-requirements.txt -r optional-requirements.txt
@ -122,4 +123,4 @@ FROM full as dev
# Forward access and error logs to Docker's log collector # Forward access and error logs to Docker's log collector
RUN ln -sf /dev/stdout /tmp/glances-root.log \ RUN ln -sf /dev/stdout /tmp/glances-root.log \
&& ln -sf /dev/stderr /var/log/error.log \ && ln -sf /dev/stderr /var/log/error.log

2
docker-files/ubuntu.Dockerfile
View File

@ -49,8 +49,6 @@ RUN apt-get update \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN python${PYTHON_VERSION} -m pip --version
RUN python${PYTHON_VERSION} -m venv --without-pip venv RUN python${PYTHON_VERSION} -m venv --without-pip venv
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./