mirror of
https://github.com/nicolargo/glances.git
synced 2024-10-10 19:27:10 +03:00
First try to solve issue on Docker images. Docker plugin do not work as expected - Related to #2392
This commit is contained in:
parent
ff504b9822
commit
c56f07673e
@ -9,6 +9,7 @@
|
||||
|
||||
# Include Requirements files
|
||||
!/requirements.txt
|
||||
!/docker-requirements.txt
|
||||
!/webui-requirements.txt
|
||||
!/optional-requirements.txt
|
||||
|
||||
|
@ -52,16 +52,15 @@ RUN apk add --no-cache \
|
||||
|
||||
RUN python${PYTHON_VERSION} -m venv --system-site-packages --without-pip venv
|
||||
|
||||
COPY requirements.txt webui-requirements.txt optional-requirements.txt ./
|
||||
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
|
||||
|
||||
##############################################################################
|
||||
# BUILD: Install the minimal image deps
|
||||
FROM build as buildMinimal
|
||||
|
||||
RUN /venv/bin/python3 -m pip install \
|
||||
docker \
|
||||
python-dateutil \
|
||||
#-r requirements.txt \
|
||||
RUN /venv/bin/python3 -m pip install --no-cache-dir \
|
||||
# Note: requirements.txt is include by dep
|
||||
-r docker-requirements.txt \
|
||||
-r webui-requirements.txt
|
||||
|
||||
##############################################################################
|
||||
@ -73,8 +72,7 @@ ARG CASS_DRIVER_NO_CYTHON=1
|
||||
# See issue 2368
|
||||
ARG CARGO_NET_GIT_FETCH_WITH_CLI=true
|
||||
|
||||
RUN /venv/bin/python3 -m pip install \
|
||||
#-r requirements.txt \
|
||||
RUN /venv/bin/python3 -m pip install --no-cache-dir \
|
||||
-r optional-requirements.txt
|
||||
|
||||
##############################################################################
|
||||
|
@ -51,24 +51,22 @@ RUN apt-get update \
|
||||
|
||||
RUN python${PYTHON_VERSION} -m venv venv
|
||||
|
||||
COPY requirements.txt webui-requirements.txt optional-requirements.txt ./
|
||||
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
|
||||
|
||||
##############################################################################
|
||||
# BUILD: Install the minimal image deps
|
||||
FROM build as buildMinimal
|
||||
|
||||
RUN /venv/bin/python3 -m pip install \
|
||||
docker \
|
||||
python-dateutil \
|
||||
#-r requirements.txt \
|
||||
RUN /venv/bin/python3 -m pip install --no-cache-dir \
|
||||
# Note: requirements.txt is include by dep
|
||||
-r docker-requirements.txt \
|
||||
-r webui-requirements.txt
|
||||
|
||||
##############################################################################
|
||||
# BUILD: Install all the deps
|
||||
FROM build as buildFull
|
||||
|
||||
RUN /venv/bin/python3 -m pip install \
|
||||
#-r requirements.txt \
|
||||
RUN /venv/bin/python3 -m pip install --no-cache-dir \
|
||||
-r optional-requirements.txt
|
||||
|
||||
##############################################################################
|
||||
|
8
docker-requirements.txt
Normal file
8
docker-requirements.txt
Normal file
@ -0,0 +1,8 @@
|
||||
# install with base requirements file
|
||||
-r requirements.txt
|
||||
|
||||
docker>=6.1.1; python_version >= "3.7"
|
||||
podman; python_version >= "3.6"
|
||||
packaging; python_version >= "3.7"
|
||||
python-dateutil
|
||||
six
|
@ -15,7 +15,6 @@ influxdb>=1.0.0 # For InfluxDB < 1.8
|
||||
influxdb-client; python_version >= "3.7" # For InfluxDB >= 1.8
|
||||
kafka-python
|
||||
netifaces
|
||||
packaging; python_version >= "3.7"
|
||||
paho-mqtt
|
||||
pika
|
||||
podman; python_version >= "3.6"
|
||||
|
@ -1,6 +1,6 @@
|
||||
psutil>=5.6.7
|
||||
defusedxml
|
||||
packaging
|
||||
packaging; python_version >= "3.7"
|
||||
future; python_version < "3.0"
|
||||
ujson<3; python_version < "3.0"
|
||||
ujson<4; python_version >= "3.5" and python_version < "3.6"
|
||||
|
3
setup.py
3
setup.py
@ -63,7 +63,7 @@ def get_install_extras_require():
|
||||
'action': ['chevron'],
|
||||
'browser': ['zeroconf==0.62.0' if PY2 else 'zeroconf>=0.19.1'],
|
||||
'cloud': ['requests'],
|
||||
'containers': ['docker>=6.1.1', 'python-dateutil', 'six'],
|
||||
# 'containers' ==> See below
|
||||
'export': ['bernhard', 'cassandra-driver', 'couchdb', 'elasticsearch',
|
||||
'graphitesender', 'influxdb>=1.0.0', 'kafka-python',
|
||||
'pika', 'paho-mqtt', 'potsdb', 'prometheus_client', 'pyzmq',
|
||||
@ -80,6 +80,7 @@ def get_install_extras_require():
|
||||
# 'gpu' and 'sensors' ==> See below
|
||||
}
|
||||
if PY3:
|
||||
extras_require['containers'] = ['docker>=6.1.1', 'podman', 'python-dateutil', 'six', 'packaging']
|
||||
extras_require['cloud'].append('packaging')
|
||||
extras_require['export'].append('influxdb-client')
|
||||
extras_require['export'].append('pymongo')
|
||||
|
Loading…
Reference in New Issue
Block a user