Revise Docker-based CI to build appmgr

Split single Dockerfile into two, one for image
  and one for test images.
Downgrade Helm from v2.13.0-rc1 to v2.12.3

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: Iedfeb2d31a78f0d14c838647bef04550f0130b71

diff --git a/Dockerfile b/Dockerfile
index adc0d17..bbd1358 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,74 +14,23 @@
 #   limitations under the License.
 
 #----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM ubuntu:16.04 as appmgr-xapp-base
-
-RUN apt-get update -y && \
-    apt-get install -y wget
 
-RUN sed -i -e "s,http://archive.ubuntu.com/ubuntu,$(wget -qO - mirrors.ubuntu.com/mirrors.txt | head -1)," /etc/apt/sources.list
-RUN sed -i -e "s,http://security.ubuntu.com/ubuntu,$(wget -qO - mirrors.ubuntu.com/mirrors.txt | head -1)," /etc/apt/sources.list
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:1-u16.04-nng1.1.1 AS appmgr-build
 
-#
-# packages
-#
-RUN apt-get update -y && \
-    apt-get upgrade -y && \
-    apt-get install -y \
-    build-essential \
-    apt-utils \
-    cmake \
-    make \
-    autoconf \
-    autoconf-archive \
-    gawk \
-    libtool \
-    automake \
-    pkg-config \
-    sudo \
-    wget \
-    nano \
-    git \
-    jq
- 
-
-#
-# go
-#
-RUN wget https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
-       tar -C /usr/local -xvf ./go1.12.linux-amd64.tar.gz
+RUN apt-get update -y && apt-get install -y jq
 
 ENV PATH="/usr/local/go/bin:${PATH}"
-
-COPY build/user_entrypoint.sh /
-
-RUN chmod +x /user_entrypoint.sh
-
-RUN mkdir -p /ws
-WORKDIR "/ws"
-ENTRYPOINT ["/user_entrypoint.sh"]
-CMD ["/bin/bash"]
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-xapp-base as appmgr-build
-
 ARG HELMVERSION=v2.12.3
-ARG PACKAGEURL=gerrit.o-ran-sc.org/r/c/ric-plt/appmgr/
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
 
-#
-# helm
-#
-RUN wget https://storage.googleapis.com/kubernetes-helm/helm-${HELMVERSION}-linux-amd64.tar.gz \
+# Install helm
+RUN wget -nv https://storage.googleapis.com/kubernetes-helm/helm-${HELMVERSION}-linux-amd64.tar.gz \
     && tar -zxvf helm-${HELMVERSION}-linux-amd64.tar.gz \
-    && cp linux-amd64/helm /usr/bin/helm \
+    && cp linux-amd64/helm /usr/local/bin/helm \
     && rm -rf helm-${HELMVERSION}-linux-amd64.tar.gz \
     && rm -rf linux-amd64
 
-# Install kubectl from Docker Hub.
+# Install kubectl from Docker Hub
 COPY --from=lachlanevenson/k8s-kubectl:v1.10.3 /usr/local/bin/kubectl /usr/local/bin/kubectl
 
 RUN mkdir -p /go/src/${PACKAGEURL}
@@ -99,51 +48,21 @@ RUN make -C /go/src/${PACKAGEURL} build
 
 CMD ["/bin/bash"]
 
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_unit
-ARG PACKAGEURL=gerrit.o-ran-sc.org/r/c/ric-plt/appmgr/
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test"]
-
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_fmt
-ARG PACKAGEURL=gerrit.o-ran-sc.org/r/c/ric-plt/appmgr/
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test-fmt"]
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_sanity
-ARG PACKAGEURL=gerrit.o-ran-sc.org/r/c/ric-plt/appmgr/
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["jq","-s",".", "api/appmgr_rest_api.json"]
-
-
-#----------------------------------------------------------
-#
 #----------------------------------------------------------
 FROM ubuntu:16.04 as appmgr
-ARG PACKAGEURL=gerrit.o-ran-sc.org/r/c/ric-plt/appmgr/
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
 
 RUN apt-get update -y \
     && apt-get install -y sudo openssl ca-certificates ca-cacert \
     && apt-get clean
 
-
 #
 # libraries and helm
 #
 COPY --from=appmgr-build /usr/local/include/ /usr/local/include/
 COPY --from=appmgr-build /usr/local/lib/ /usr/local/lib/
-COPY --from=appmgr-build /usr/bin/helm /usr/bin/helm
-COPY --from=appmgr-build /usr/local/bin/kubectl /usr/bin/kubectl
+COPY --from=appmgr-build /usr/local/bin/helm /usr/local/bin/helm
+COPY --from=appmgr-build /usr/local/bin/kubectl /usr/local/bin/kubectl
 
 RUN ldconfig
 
@@ -156,7 +75,6 @@ RUN mkdir -p /opt/xAppManager \
 COPY --from=appmgr-build /go/src/${PACKAGEURL}/cache/go/cmd/appmgr /opt/xAppManager/appmgr
 #COPY --from=appmgr-build /go/src/${PACKAGEURL}/config/appmgr.yaml /opt/etc/xAppManager/config-file.yaml
 
-
 WORKDIR /opt/xAppManager
 
 COPY appmgr-entrypoint.sh /opt/xAppManager/

diff --git a/Dockerfile.tests b/Dockerfile.tests
new file mode 100644 (file)
index 0000000..26d0ccb
--- /dev/null
+++ b/Dockerfile.tests
@@ -0,0 +1,68 @@
+#   Copyright (c) 2019 AT&T Intellectual Property.
+#   Copyright (c) 2019 Nokia.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+#----------------------------------------------------------
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu-c-go-nng:3-u16.04-nng1.1.1 AS appmgr-build
+
+RUN apt-get update -y  &&  apt-get install -y jq
+
+ENV PATH="/usr/local/go/bin:${PATH}"
+ARG HELMVERSION=v2.13.0-rc.1
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
+
+#
+# helm
+#
+RUN wget https://storage.googleapis.com/kubernetes-helm/helm-${HELMVERSION}-linux-amd64.tar.gz \
+    && tar -zxvf helm-${HELMVERSION}-linux-amd64.tar.gz \
+    && cp linux-amd64/helm /usr/local/bin/helm \
+    && rm -rf helm-${HELMVERSION}-linux-amd64.tar.gz \
+    && rm -rf linux-amd64
+
+# Install kubectl from Docker Hub.
+COPY --from=lachlanevenson/k8s-kubectl:v1.10.3 /usr/local/bin/kubectl /usr/local/bin/kubectl
+
+RUN mkdir -p /go/src/${PACKAGEURL}
+WORKDIR "/go/src/${PACKAGEURL}"
+ENV GOPATH="/go"
+
+# Module prepare (if go.mod/go.sum updated)
+COPY go.mod /go/src/${PACKAGEURL}
+COPY go.sum /go/src/${PACKAGEURL}
+RUN GO111MODULE=on go mod download
+
+# build
+COPY . /go/src/${PACKAGEURL}
+RUN make -C /go/src/${PACKAGEURL} build
+
+CMD ["/bin/bash"]
+
+#----------------------------------------------------------
+FROM appmgr-build as appmgr-test_unit
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
+WORKDIR "/go/src/${PACKAGEURL}"
+CMD ["make","go-test"]
+
+#----------------------------------------------------------
+FROM appmgr-build as appmgr-test_fmt
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
+WORKDIR "/go/src/${PACKAGEURL}"
+CMD ["make","go-test-fmt"]
+
+#----------------------------------------------------------
+FROM appmgr-build as appmgr-test_sanity
+ARG PACKAGEURL=gerrit.o-ran-sc.org/r/ric-plt/appmgr
+WORKDIR "/go/src/${PACKAGEURL}"
+CMD ["jq","-s",".", "api/appmgr_rest_api.json"]

diff --git a/container-tag.yaml b/container-tag.yaml
index d7e5871..31d972c 100644 (file)
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -1,3 +1,4 @@
-# The Jenkins job requires a tag to build a Docker image
+# The Jenkins job uses this string for the tag in the image name
+# for example nexus3.o-ran-sc.org:10004/my-image-name:my-tag
 ---
 tag: '0.1.4'