From 1263ce3959bccb268fc4a22c57937166e03f8009 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Wed, 13 Nov 2019 14:56:12 -0500 Subject: [PATCH] Fix docker files The mc-core docker file wasn't referencing a valid image to use as base, and the listener docker file needed to reference a legitmate RIC image and pull RMR rather than building NNG and RMR. Signed-off-by: E. Scott Daniels Change-Id: I24d9b00dfb784cc47df4160c3560a5df99d1bd4c --- mc-core/Dockerfile | 2 +- sidecars/listener/Dockerfile | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile index 0c5c14a..a88b146 100644 --- a/mc-core/Dockerfile +++ b/mc-core/Dockerfile @@ -16,7 +16,7 @@ ARG STAGE_DIR=/mc -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:1-u16.04-nng1.1.1 AS project-build +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng AS project-build # Update & installation of linux packages RUN apt-get update -y && \ apt-get install -y curl && \ diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile index f8cf59e..f11a89f 100644 --- a/sidecars/listener/Dockerfile +++ b/sidecars/listener/Dockerfile @@ -41,11 +41,21 @@ # Author: E. Scott Daniels -FROM ubuntu:18.04 as buildenv +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng as buildenv RUN mkdir /playpen RUN apt-get update && apt-get install -y cmake gcc make git g++ wget +WORKDIR /playpen +# Install RMr (runtime and dev) from debian package cached on packagecloud.io +ARG RMR_VER=1.10.2 + +RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb +RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb +RUN dpkg -i rmr_${RMR_VER}_amd64.deb +RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb + + RUN mkdir /playpen/bin /playpen/src ARG SRC=. COPY ${SRC}/build_dev_env.sh /playpen/bin/ -- 2.16.6