X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=Dockerfile;h=8d31e07aba871716c306d1f5f1f250835093e4cd;hb=dc5f5d8b94954d42d6e87c0c5586686a0fc124fb;hp=4694ecd26058f0b36efca1aa89204b2124b0260c;hpb=95af2c22b4ed472d9535d25bace513876a2e9c26;p=ric-plt%2Fo1.git diff --git a/Dockerfile b/Dockerfile index 4694ecd..8d31e07 100755 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,8 @@ RUN \ RUN \ cd /opt/dev && \ git clone https://github.com/sysrepo/sysrepo.git && \ - cd sysrepo && mkdir build && cd build && \ + cd sysrepo && sed -i -e 's/2000/30000/g;s/5000/30000/g' src/common.h.in && \ + mkdir build && cd build && \ cmake -DCMAKE_BUILD_TYPE:String="Release" -DENABLE_TESTS=OFF -DREPOSITORY_LOC:PATH=/etc/sysrepo .. && \ make -j2 && \ make install && make sr_clean && \ @@ -101,13 +102,17 @@ RUN \ # ====================================================================== # RMR -ARG RMRVERSION=3.1.0 +ARG RMRVERSION=3.6.3 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 + +# Install kubectl from Docker Hub +COPY --from=lachlanevenson/k8s-kubectl:v1.16.0 /usr/local/bin/kubectl /usr/local/bin/kubectl + RUN ldconfig # Swagger @@ -194,6 +199,8 @@ COPY --from=o1mediator-build /usr/local/share/ /usr/local/share/ COPY --from=o1mediator-build /usr/local/etc/ /usr/local/etc/ COPY --from=o1mediator-build /usr/local/bin/ /usr/local/bin/ COPY --from=o1mediator-build /usr/local/lib/ /usr/local/lib/ +COPY --from=o1mediator-build /usr/local/bin/kubectl /usr/local/bin/kubectl + RUN ldconfig # copy yang models with data