Update Dockerfiles to upgrade pip before installing osm-common to avoid unknown packa...

Change-Id: I200063211508d1bf08532f7c3af76768e635bf6c
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 0e025f7..c241515 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -54,13 +54,14 @@ RUN curl https://get.helm.sh/helm-v3.15.1-linux-amd64.tar.gz --output helm-v3.15
     && rm -r linux-amd64/
 
 ARG COMMON_GERRIT_REFSPEC=master
+RUN pip3 install -U pip build
 RUN git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/common.git /tmp/osm-common && \
     cd /tmp/osm-common && \
     git fetch origin ${COMMON_GERRIT_REFSPEC} && \
     git checkout FETCH_HEAD && \
     cd - && \
-    pip install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
-    pip install /tmp/osm-common
+    pip3 install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
+    pip3 install /tmp/osm-common
 
 ARG PYTHON3_OSM_LCM_URL
 RUN curl $PYTHON3_OSM_LCM_URL -o osm_lcm.deb

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index ba283c3..86a0acf 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -40,13 +40,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     openssh-client=1:8.* git
 
 ARG COMMON_GERRIT_REFSPEC=master
+RUN pip3 install -U pip build
 RUN git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/common.git /tmp/osm-common && \
     cd /tmp/osm-common && \
     git fetch origin ${COMMON_GERRIT_REFSPEC} && \
     git checkout FETCH_HEAD && \
     cd - && \
-    pip install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
-    pip install /tmp/osm-common
+    pip3 install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
+    pip3 install /tmp/osm-common
 
 ARG PYTHON3_OSM_MON_URL
 RUN curl $PYTHON3_OSM_MON_URL -o osm_mon.deb

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index f7d823d..dce5590 100644 (file)
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -41,13 +41,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     && rm -rf /var/lib/apt/lists/*
 
 ARG COMMON_GERRIT_REFSPEC=master
+RUN pip3 install -U pip build
 RUN git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/common.git /tmp/osm-common && \
     cd /tmp/osm-common && \
     git fetch origin ${COMMON_GERRIT_REFSPEC} && \
     git checkout FETCH_HEAD && \
     cd - && \
-    pip install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
-    pip install /tmp/osm-common
+    pip3 install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
+    pip3 install /tmp/osm-common
 
 ARG PYTHON3_OSM_IM_URL
 ARG PYTHON3_OSM_NBI_URL

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 69d40b4..dde5261 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -43,13 +43,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     git
 
 ARG COMMON_GERRIT_REFSPEC=master
+RUN pip3 install -U pip build
 RUN git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/common.git /tmp/osm-common && \
     cd /tmp/osm-common && \
     git fetch origin ${COMMON_GERRIT_REFSPEC} && \
     git checkout FETCH_HEAD && \
     cd - && \
-    pip install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
-    pip install /tmp/osm-common
+    pip3 install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
+    pip3 install /tmp/osm-common
 
 ARG PYTHON3_OSM_NG_RO_URL
 ARG PYTHON3_OSM_RO_PLUGIN_URL