X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=cb18a63921272508ca6d699bd78099dbdbd16509;hb=refs%2Fheads%2Fmaster;hp=a9e6c15bda2f5c18c595c55c1e5ebfba9d504f87;hpb=b7a743adb64d9a737e505d54fbdbe46777551d06;p=ric-plt%2Fa1.git diff --git a/Dockerfile b/Dockerfile index a9e6c15..cb18a63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN apt update && apt install --reinstall -y \ #Install RMR -ARG RMR_VER=4.8.3 +ARG RMR_VER=4.9.4 ARG RMR_PKG_URL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/ RUN wget -nv --content-disposition ${RMR_PKG_URL}/rmr_${RMR_VER}_amd64.deb/download.deb @@ -64,9 +64,8 @@ RUN GO111MODULE=on go mod download # build and test COPY . /go/src/ws COPY ./config/config_test.yaml /opt/a1-mediator/ -COPY ./config/config_rmr.json /opt/a1-mediator/ -ENV CFG_FILE=/opt/a1-mediator/config-_rmr.json +ENV CFG_FILE=/opt/a1-mediator/config_test.yaml ENV A1_CONFIG_FILE=/opt/a1-mediator/config_test.yaml @@ -92,7 +91,7 @@ RUN apt-get update -y \ #Install RMR -ARG RMR_VER=4.8.3 +ARG RMR_VER=4.9.1 ARG RMR_PKG_URL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/ RUN wget -nv --content-disposition ${RMR_PKG_URL}/rmr_${RMR_VER}_amd64.deb/download.deb @@ -110,16 +109,16 @@ RUN mkdir -p /opt/a1-mediator \ COPY --from=a1-build /go/src/ws/cache/go/cmd/a1 /opt/a1-mediator/a1 COPY ./config/config.yaml /opt/a1-mediator/ -COPY ./config/config_rmr.json /opt/a1-mediator/ WORKDIR /opt/a1-mediator -ARG RMR_CONFIG=/opt/a1-mediator/config-_rmr.json -ENV CFG_FILE=$RMR_CONFIG +ARG CONFIG=/opt/a1-mediator/config.yaml +ENV CFG_FILE=$CONFIG ARG A1_CONFIG=/opt/a1-mediator/config.yaml ENV A1_CONFIG_FILE=$A1_CONFIG COPY a1-entrypoint.sh /opt/a1-mediator/ +RUN chmod -R 755 /opt/a1-mediator/a1-entrypoint.sh ENTRYPOINT ["/opt/a1-mediator/a1-entrypoint.sh"]