First try to solve issue on Docker images. Docker plugin do not work as expected - Related to #2392

7 files changed, 22 insertions, 17 deletions

diff --git a/.dockerignore b/.dockerignore
index de510139..7b9c92b8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,6 +9,7 @@
 
 # Include Requirements files
 !/requirements.txt
+!/docker-requirements.txt
 !/webui-requirements.txt
 !/optional-requirements.txt
 
diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index aa551ce9..768cf187 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -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
 
 ##############################################################################
diff --git a/docker-files/ubuntu.Dockerfile b/docker-files/ubuntu.Dockerfile
index b5c148bc..05186eaf 100644
--- a/docker-files/ubuntu.Dockerfile
+++ b/docker-files/ubuntu.Dockerfile
@@ -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
 
 ##############################################################################
diff --git a/docker-requirements.txt b/docker-requirements.txt
new file mode 100644
index 00000000..54c30b5e
--- /dev/null
+++ b/docker-requirements.txt
@@ -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
diff --git a/optional-requirements.txt b/optional-requirements.txt
index baab58a3..014fd328 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -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"
diff --git a/requirements.txt b/requirements.txt
index 7d8dc5d5..270dc661 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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"
diff --git a/setup.py b/setup.py
index da9f384a..1c951a00 100755
--- a/setup.py
+++ b/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')