Merge remote-tracking branch 'origin/ci-fix-docker-build' into integration_2021_wk51_b

ci-scripts/cls_containerize.py

@@ -338,6 +338,12 @@ class Containerize():
 		mySSH.command('zip -r -qq build_log_' + self.testCase_id + '.zip build_log_' + self.testCase_id, '\$', 5)
 		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
 		mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
+		# Remove all intermediate build images
+		if self.ranAllowMerge and forceBaseImageBuild:
+			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
+		for image,pattern in imageNames:
+			mySSH.command(self.cli + ' image rm ' + image + ':' + imageTag + ' || true', '\$', 30)
+		mySSH.command('docker rmi ran-build:' + imageTag,'\$', 5)
 		mySSH.close()
 		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
 

docker/Dockerfile.eNB.rhel8.2

@@ -87,8 +87,12 @@ COPY --from=enb-base \
     /lib64/libboost_atomic.so.1.66.0 \
     /lib64/libboost_timer.so.1.66.0 \
     /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
     /lib64/
 
+
 # Now we are copying from builder-image the UHD files.
 COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
 COPY --from=enb-base /usr/local/lib/libprotobuf-c.so.1 /usr/local/lib

docker/Dockerfile.gNB.rhel8.2

@@ -93,6 +93,9 @@ COPY --from=gnb-base \
     /lib64/libboost_atomic.so.1.66.0 \
     /lib64/libboost_timer.so.1.66.0 \
     /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
     /lib64/
 
 # Now we are copying from builder-image the UHD files.

docker/Dockerfile.lteUE.rhel8.2

@@ -91,6 +91,9 @@ COPY --from=lte-ue-base \
     /lib64/libboost_atomic.so.1.66.0 \
     /lib64/libboost_timer.so.1.66.0 \
     /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
     /lib64/
 
 # Now we are copying from builder-image the UHD files.

docker/Dockerfile.nrUE.rhel8.2

@@ -95,6 +95,9 @@ COPY --from=nr-ue-base \
     /lib64/libboost_atomic.so.1.66.0 \
     /lib64/libboost_timer.so.1.66.0 \
     /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
     /lib64/
 
 # Now we are copying from builder-image the UHD files.