From 8492ba318dfe939c74a22a6303144b66c7ab4923 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Tue, 4 Jun 2019 15:50:49 -0400 Subject: [PATCH] Add container tag file to support Jenkins jobs Use version 0.1.3 as the fixed tag in the file. Updated from oran-osc.org to o-ran-sc.org. Also removed apt-get upgrade from Dockerfile per recommendations https://docs.docker.com/develop/develop-images/dockerfile_best-practices/ Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ifdffb2d01a77f0d14c038647bee04559f0140b71 --- Dockerfile | 5 ++--- container-tag.yaml | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 Dockerfile create mode 100644 container-tag.yaml diff --git a/Dockerfile b/Dockerfile old mode 100755 new mode 100644 index fcf2abd..142c876 --- a/Dockerfile +++ b/Dockerfile @@ -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,9 +58,9 @@ 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/ric-plt/lib/rmr \ + && 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.oran-osc.org/r/com/log \ + && cd /opt/build && git clone https://gerrit.o-ran-sc.org/r/com/log \ && cd log/ ; ./autogen.sh ; ./configure ; make ; make install \ && ldconfig diff --git a/container-tag.yaml b/container-tag.yaml new file mode 100644 index 0000000..585bbf8 --- /dev/null +++ b/container-tag.yaml @@ -0,0 +1,3 @@ +# The Jenkins job requires a tag to build a Docker image +--- +tag: '0.1.3' -- 2.16.6