Using different versioning scheme
Using xapp-frame version with RMR SI95 backend
Change-Id: Ic10efca8e391757f4ddde2a4b20efc419cf94157
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
diff --git a/Dockerfile b/Dockerfile
index 4e82a9a..b49723c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,11 +54,21 @@
&& go install github.com/go-delve/delve/cmd/dlv
-ARG RMRVERSION=3.5.0
-# Install RMr shared library
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
-# Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+#
+# RMR
+#
+ARG RMRVERSION=3.6.2
+ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb
+ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb
+RUN wget --content-disposition ${RMRLIBURL} && dpkg -i rmr_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
+RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb
+
+
+RUN mkdir /manifests/
+RUN echo "rmrlib ${RMRVERSION} ${RMRLIBURL}" >> /manifests/versions.txt
+RUN echo "rmrdev ${RMRVERSION} ${RMRDEVURL}" >> /manifests/versions.txt
+RUN echo "swagger ${SWAGGERVERSION} ${SWAGGERURL}" >> /manifests/versions.txt
WORKDIR /opt/submgr
@@ -80,6 +90,10 @@
cp *.h /usr/local/include/ && \
ldconfig
+RUN echo "E2AP ?" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-NRT ?" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-X2 ?" >> /manifests/versions.txt
+
COPY e2ap e2ap
RUN cd e2ap/libe2ap_wrapper && \
gcc -c ${CFLAGS} -g -fPIC *.c && \
@@ -112,6 +126,8 @@
RUN go mod download
RUN go mod tidy
+RUN cp go.mod go.sum /manifests/
+
#
#
#
@@ -131,6 +147,8 @@
swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
+RUN echo "rtmgrapi ${RTMGRVERSION} https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" >> /manifests/versions.txt
+
#
#
#
@@ -172,6 +190,8 @@
RUN apt update && apt install -y iputils-ping net-tools curl tcpdump
+COPY --from=submgrbuild /manifests /manifests
+
COPY run_submgr.sh /
COPY --from=submgrbuild /opt/bin/submgr /
COPY --from=submgrbuild /usr/local/include /usr/local/include