From: Timo Tietavainen <timo.tietavainen@nokia.com>
Date: Wed, 23 Jun 2021 10:53:41 +0000 (+0000)
Subject: Merge "Add E2AP package that supports asn1 encoding/decoding function for E2AP."
X-Git-Tag: 2.2.0~2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=5e8d27bedbc0d63a6e5ec30e3d752632885b56c4;hp=-c;p=ric-plt%2Fxapp-frame-py.git

Merge "Add E2AP package that supports asn1 encoding/decoding function for E2AP."
---

5e8d27bedbc0d63a6e5ec30e3d752632885b56c4
diff --combined Dockerfile-Unit-Test
index 6e6497d,575f4ea..3366096
--- a/Dockerfile-Unit-Test
+++ b/Dockerfile-Unit-Test
@@@ -14,13 -14,38 +14,38 @@@
  #   See the License for the specific language governing permissions and
  #   limitations under the License.
  # ==================================================================================
- FROM python:3.8-alpine
+ FROM python:3.8-slim as stretch
  
  # sdl uses hiredis which needs gcc
- RUN apk update && apk add gcc musl-dev
+ RUN apt-get update && \
+     apt-get install -y \
+         wget gcc musl-dev
  
- # copy rmr libraries from builder image in lieu of an Alpine package
- COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.1.2 /usr/local/lib64/librmr* /usr/local/lib64/
+ ARG rmr_version=4.1.2
+ ARG e2ap_version=1.1.0
+ 
+ # download rmr and e2ap libraries from package cloud
+ RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${rmr_version}_amd64.deb/download.deb
+ RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${rmr_version}_amd64.deb/download.deb
+ 
+ RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/riclibe2ap_${e2ap_version}_amd64.deb/download.deb
+ RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/riclibe2ap-dev_${e2ap_version}_amd64.deb/download.deb
+ 
+ RUN dpkg -i rmr_${rmr_version}_amd64.deb
+ RUN dpkg -i rmr-dev_${rmr_version}_amd64.deb
+ 
+ RUN dpkg -i riclibe2ap_${e2ap_version}_amd64.deb
+ RUN dpkg -i riclibe2ap-dev_${e2ap_version}_amd64.deb
+ 
+ RUN ls /usr/local/lib/
+ 
+ FROM python:3.8-slim
+ 
+ ARG rmr_version=4.1.2
+ ARG e2ap_version=1.1.0
+ 
+ COPY --from=stretch /usr/local/lib/librmr_si.so.${rmr_version} /usr/local/lib/librmr_si.so
+ COPY --from=stretch /usr/local/lib/libriclibe2ap.so.${e2ap_version} /usr/local/lib/libriclibe2ap.so
  
  # Upgrade pip, install tox
  RUN pip install --upgrade pip && pip install tox
@@@ -28,7 -53,7 +53,7 @@@
  # copies
  COPY ricxappframe/ /tmp/ricxappframe
  COPY tests/ /tmp/tests
 -COPY setup.py tox.ini LICENSE.txt /tmp/
 +COPY setup.py tox.ini LICENSE.txt .coveragerc /tmp/
  WORKDIR /tmp
  
  # Run the unit tests