Refactor docker timeouts for opteng image

scikit-learning package is causing timeouts for alpine based docker.

Change-Id: I1b8670bacce9135b74d01778da47926f10f09e6a
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-722

diff --git a/docker/opteng/Dockerfile b/docker/opteng/Dockerfile
index bd58f35..41485ef 100644 (file)
--- a/docker/opteng/Dockerfile
+++ b/docker/opteng/Dockerfile
@@ -40,8 +40,7 @@ RUN apk update  && apk upgrade \
     && apk --no-cache --update add less ca-certificates bash libxslt-dev unzip \
                                 freetype freetype-dev libstdc++ build-base libc6-compat lapack-dev openblas-dev \
     && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2 \
-    && pip install --no-cache-dir --upgrade pip wheel setuptools \
-    && pip install --no-cache-dir Cython numpy==1.17.3 scipy==1.3.1
+    && pip install --no-cache-dir --upgrade pip wheel setuptools
 
 # Minizinc
 RUN wget -q $MZN_DL_URL -O mz.tgz \

diff --git a/docker/osdf/Dockerfile b/docker/osdf/Dockerfile
index 5a14a04..1533d5f 100644 (file)
--- a/docker/osdf/Dockerfile
+++ b/docker/osdf/Dockerfile
@@ -69,7 +69,7 @@ RUN mkdir -p /var/log/onap/optf/osdf/ \
     && chown -R onap:onap /var/log/onap \
     && chown -R onap:onap /opt/osdf
 
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt -r requirements-osdf.txt
 
 USER onap
 

diff --git a/requirements-osdf.txt b/requirements-osdf.txt
new file mode 100644 (file)
index 0000000..c095258
--- /dev/null
+++ b/requirements-osdf.txt
@@ -0,0 +1 @@
+scikit-learn>=0.22.0
\ No newline at end of file

diff --git a/requirements.txt b/requirements.txt
index b2bfd53..c3749e8 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,3 @@ pymzn>=0.18.3
 onappylog>=1.0.9
 pathtools>=0.1.2
 pycryptodome>=3.9.6
-numpy==1.17.3
-scipy==1.3.1
-scikit-learn>=0.22.0

diff --git a/tox.ini b/tox.ini
index 7b0fb07..11c541a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -17,6 +17,7 @@ commands =
     # TODO: need to update the above "omit" when we package osdf as pip-installable
 deps = -r{toxinidir}/requirements.txt
     -r{toxinidir}/test/test-requirements.txt
+    -r{toxinidir}/requirements-osdf.txt
     -r{toxinidir}/requirements-opteng.txt
 
 [run]