Baseimage changes as discussed in hyperledger#1684

Signed-off-by: Philipp Schlarb <[email protected]>
sjono10 · Nov 24, 2021 · 9c3d0e4 · 9c3d0e4
1 parent 1eca095
commit 9c3d0e4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile b/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile
@@ -1,4 +1,4 @@
-FROM __NS__/indy-baseimage:0.0.3-master
+FROM __NS__/indy-baseimage:0.0.4
 LABEL maintainer="Hyperledger <[email protected]>"
 
 # indy repos

diff --git a/environment/docker/baseimage/indy-baseci.version b/environment/docker/baseimage/indy-baseci.version
@@ -1 +1 @@
-0.0.3-master
+0.0.4
diff --git a/environment/docker/baseimage/indy-baseimage.ubuntu.dockerfile b/environment/docker/baseimage/indy-baseimage.ubuntu.dockerfile
@@ -19,10 +19,16 @@ RUN apt-get update && apt-get install -y \
     python-setuptools
 
 # pypi based packages
-RUN pip3 install -U \ 
-    'pip<10.0.0' \
-    setuptools \
-    virtualenv
+RUN pip3 install -U\
+    "pip <10.0.0" \
+    "setuptools<=50.3.2"
+
+# needs to be installed separately and pinned to version 20.0.25 to be compatible with Python3.5 and packages like zipp==1.2.0
+RUN pip3 install -U \
+    'virtualenv==20.0.35'
+
+
+RUN ln -s /usr/bin/pip3 /usr/bin/pip
 
 COPY scripts/clean.sh /usr/local/bin/indy_image_clean
 RUN chmod 755 /usr/local/bin/indy_image_clean

diff --git a/environment/docker/baseimage/indy-baseimage.version b/environment/docker/baseimage/indy-baseimage.version
@@ -1 +1 @@
-0.0.3-master
+0.0.4
diff --git a/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile b/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile
@@ -1,4 +1,4 @@
-FROM __NS__/indy-baseci:0.0.3-master
+FROM __NS__/indy-baseci:0.0.4
 LABEL maintainer="Hyperledger <[email protected]>"
 
 # indy repos

diff --git a/environment/docker/baseimage/indy-core-baseci.version b/environment/docker/baseimage/indy-core-baseci.version
@@ -1 +1 @@
-0.0.3-master
+0.0.4