#451 update base docker images

MetaCell · Mar 4, 2022 · adac1fb · adac1fb
1 parent e06d8f2
commit adac1fb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/infrastructure/base-images/cloudharness-base-debian/Dockerfile b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
@@ -1,14 +1,19 @@
 ARG PARENT=python:3.7.6
 FROM ${PARENT}
 
+COPY libraries/models/requirements.txt /libraries/models/requirements.txt
+RUN pip install -r /libraries/models/requirements.txt
 COPY libraries/cloudharness-common/requirements.txt /libraries/cloudharness-common/requirements.txt
 RUN pip install -r /libraries/cloudharness-common/requirements.txt
 COPY libraries/client/cloudharness_cli/requirements.txt /libraries/client/cloudharness_cli/requirements.txt
 RUN pip install -r /libraries/client/cloudharness_cli/requirements.txt
 
+COPY libraries/cloudharness-common /libraries/models
 COPY libraries/cloudharness-common /libraries/cloudharness-common
 COPY libraries/client/cloudharness_cli /libraries/client/cloudharness_cli
 
+#
+RUN pip install -e /libraries/models
 RUN pip install -e /libraries/cloudharness-common
 RUN pip install -e /libraries/client/cloudharness_cli
 

diff --git a/infrastructure/base-images/cloudharness-base/Dockerfile b/infrastructure/base-images/cloudharness-base/Dockerfile
@@ -8,15 +8,20 @@ RUN apk upgrade
 RUN apk add bash
 # dev tools needed by some python libraries
 RUN apk add gcc libc-dev g++ python3-dev libffi-dev openssl-dev rust musl-dev cargo
+
+COPY libraries/models/requirements.txt /libraries/models/requirements.txt
+RUN pip install -r /libraries/models/requirements.txt
 COPY libraries/cloudharness-common/requirements.txt /libraries/cloudharness-common/requirements.txt
 RUN pip install -r /libraries/cloudharness-common/requirements.txt
 COPY libraries/client/cloudharness_cli/requirements.txt /libraries/client/cloudharness_cli/requirements.txt
 RUN pip install -r /libraries/client/cloudharness_cli/requirements.txt
 
+COPY libraries/cloudharness-common /libraries/models
 COPY libraries/cloudharness-common /libraries/cloudharness-common
 COPY libraries/client/cloudharness_cli /libraries/client/cloudharness_cli
 
 #
+RUN pip install -e /libraries/models
 RUN pip install -e /libraries/cloudharness-common
 RUN pip install -e /libraries/client/cloudharness_cli
 

diff --git a/libraries/models/.openapi-generator-ignore b/libraries/models/.openapi-generator-ignore
@@ -33,4 +33,5 @@ setup.py
 encoder.py
 *.sh
 */util.py
-*/models/base_model_.py
+*/models/base_model_.py
+requirements.txt
diff --git a/libraries/models/requirements.txt b/libraries/models/requirements.txt
@@ -1,11 +1,3 @@
-connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
-# 2.3 is the last version that supports python 3.4-3.5
-connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
-# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
-# we must peg werkzeug versions below to fix connexion
-# https://github.com/zalando/connexion/pull/1044
-werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
 swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
-Flask == 1.1.2