X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=Dockerfile;h=142c8768c6b7337c899d2012d518516a13e436ed;hb=8492ba318dfe939c74a22a6303144b66c7ab4923;hp=b2b314b60887718a597bf763f67d46485f981413;hpb=97e8d9a3254989f086d7ad02c168442832b49946;p=ric-plt%2Fappmgr.git

diff --git a/Dockerfile b/Dockerfile
old mode 100755
new mode 100644
index b2b314b..142c876
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 #----------------------------------------------------------
 #
 #----------------------------------------------------------
-FROM ubuntu:16.04 as xapp-base
+FROM ubuntu:16.04 as appmgr-xapp-base
 
 RUN apt-get update -y && \
     apt-get install -y wget
@@ -28,7 +28,6 @@ RUN sed -i -e "s,http://security.ubuntu.com/ubuntu,$(wget -qO - mirrors.ubuntu.c
 # packages
 #
 RUN apt-get update -y && \
-    apt-get upgrade -y && \
     apt-get install -y \
     build-essential \
     apt-utils \
@@ -59,14 +58,14 @@ ENV PATH="/usr/local/go/bin:${PATH}"
 # rancodev libs
 #
 RUN mkdir -p /opt/build \
-    && cd /opt/build && git clone https://gerrit.oran-osc.org/r/com/log \
+    && cd /opt/build && git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
+    && cd rmr/; mkdir build; cd build; cmake ..; make install \
+    && cd /opt/build && git clone https://gerrit.o-ran-sc.org/r/com/log \
     && cd log/ ; ./autogen.sh ; ./configure ; make ; make install \
     && ldconfig
 
-COPY build/build_entrypoint.sh /
 COPY build/user_entrypoint.sh /
 
-RUN chmod +x /build_entrypoint.sh
 RUN chmod +x /user_entrypoint.sh
 
 RUN mkdir -p /ws
@@ -77,12 +76,9 @@ CMD ["/bin/bash"]
 #----------------------------------------------------------
 #
 #----------------------------------------------------------
-FROM xapp-base as appmgr-build
+FROM appmgr-xapp-base as appmgr-build
 
 ARG PACKAGEURL
-ARG PACKAGEREPO
-ARG SSH_PRIVATE_KEY
-ARG NETRC_CONFIG
 ARG HELMVERSION
 
 
@@ -105,13 +101,12 @@ ENV GOPATH="/go"
 # Module prepare (if go.mod/go.sum updated)
 COPY go.mod /go/src/${PACKAGEURL}
 COPY go.sum /go/src/${PACKAGEURL}
-RUN GO111MODULE=on /build_entrypoint.sh go mod download
+RUN GO111MODULE=on go mod download
 
 # build
 COPY . /go/src/${PACKAGEURL}
-RUN /build_entrypoint.sh make -C /go/src/${PACKAGEURL} build
+RUN make -C /go/src/${PACKAGEURL} build
 
-ENTRYPOINT ["/build_entrypoint.sh"]
 CMD ["/bin/bash"]
 
 
@@ -168,7 +163,7 @@ RUN ldconfig
 RUN mkdir -p /opt/xAppManager \
     && chmod -R 755 /opt/xAppManager
 
-COPY --from=appmgr-build /go/src/${PACKAGEURL}/build/cache/cmd/appmgr /opt/xAppManager/appmgr
+COPY --from=appmgr-build /go/src/${PACKAGEURL}/cache/go/cmd/appmgr /opt/xAppManager/appmgr
 #COPY --from=appmgr-build /go/src/${PACKAGEURL}/config/appmgr.yaml /opt/etc/xAppManager/config-file.yaml