From 3f200eef5ff26eaf08127c987a862bf43e057ec6 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Wed, 20 May 2020 17:34:17 -0400 Subject: [PATCH] Ensure that SDL libraries are in the image The SDL libraries don't install into the usual /usr/local portion of the filesystem and thus were not being included in the final image. This change ensures they are included by reinstalling them in the final image. Signed-off-by: E. Scott Daniels Change-Id: I7c91e9e10759dd0b8ecadf2d685bf6ef1956e8d1 --- Dockerfile | 16 ++++++++++++++-- container-tag.yaml | 2 +- docs/rel-notes.rst | 4 ++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f8f596..8c111c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,7 +73,7 @@ RUN git clone https://github.com/Tencent/rapidjson && \ make install && \ cd ${STAGE_DIR} && \ rm -rf rapidjson - + # @@ -96,10 +96,22 @@ COPY assets/bootstrap.rt /playpen/assets # - # ----- create final, smaller, image ---------------------------------- FROM ubuntu:18.04 +# package cloud urls for wget +ARG PC_REL_URL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch +ARG PC_STG_URL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch +ARG SDL_VER=1.0.4 + +# sdl doesn't install into /usr/local like everybody else, and we don't want to +# hunt for it or copy all of /usr, so we must pull and reinstall it. +RUN apt-get update +RUN apt-get install -y libboost-filesystem1.65.1 libboost-system1.65.1 libhiredis0.13 wget +RUN wget -nv --content-disposition ${PC_STG_URL}/sdl_${SDL_VER}-1_amd64.deb/download.deb && \ + wget -nv --content-disposition ${PC_STG_URL}/sdl-dev_${SDL_VER}-1_amd64.deb/download.deb &&\ + dpkg -i sdl-dev_${SDL_VER}-1_amd64.deb sdl_${SDL_VER}-1_amd64.deb + RUN rm -fr /var/lib/apt/lists # snarf the various sdl, rmr, and cpp-framework libraries as well as any binaries diff --git a/container-tag.yaml b/container-tag.yaml index 010bf19..65ce26e 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -1,3 +1,3 @@ # this is used by CI jobs to apply a tag when it builds the image --- -tag: '1.0.3' +tag: '1.0.4' diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst index 2c0d29b..c866179 100644 --- a/docs/rel-notes.rst +++ b/docs/rel-notes.rst @@ -9,6 +9,10 @@ Traffic Steering xAPP ===================== +2020 May 20 Version 1.0.4 +---------------------------- + Ensure that the SDL libraries are included in the image. + 2020 April 28 Version 1.0.0 ---------------------------- -- 2.16.6