X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=Dockerfile;h=adc6a04d776aff3fe7302935c8b557963a86db42;hb=refs%2Ftags%2Fv0.1.9;hp=c20bde2fbd333a4f1c9cce7c65d9350f9456f824;hpb=d732b871ab1dccaf9ef5311dede522879193b45e;p=ric-plt%2Fappmgr.git

diff --git a/Dockerfile b/Dockerfile
index c20bde2..adc6a04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,137 +14,58 @@
 #   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-ubuntu18-c-go:2-u18.04-nng 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}"
+ARG HELMVERSION=v2.12.3
 
-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 PACKAGEURL
-ARG HELMVERSION
-
-
-#
-# 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}
-WORKDIR "/go/src/${PACKAGEURL}"
+RUN mkdir -p /ws
+WORKDIR "/ws"
 ENV GOPATH="/go"
 
 # Module prepare (if go.mod/go.sum updated)
-COPY go.mod /go/src/${PACKAGEURL}
-COPY go.sum /go/src/${PACKAGEURL}
+COPY go.mod /ws
+COPY go.sum /ws
 RUN GO111MODULE=on go mod download
 
-# build
-COPY . /go/src/${PACKAGEURL}
-RUN make -C /go/src/${PACKAGEURL} build
+# build and test
+COPY . /ws
 
-CMD ["/bin/bash"]
+RUN make -C /ws go-build
 
+RUN make -C /ws go-test-fmt
 
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_unit
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test"]
-
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_fmt
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test-fmt"]
-
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_sanity
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["jq","-s",".", "api/appmgr_rest_api.json"]
+#RUN make -C /ws go-test
 
+CMD ["/bin/bash"]
 
 #----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM ubuntu:16.04 as appmgr
-ARG PACKAGEURL
+FROM ubuntu:18.04 as 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
 
@@ -154,9 +75,7 @@ RUN ldconfig
 RUN mkdir -p /opt/xAppManager \
     && chmod -R 755 /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
-
+COPY --from=appmgr-build /ws/cache/go/cmd/appmgr /opt/xAppManager/appmgr
 
 WORKDIR /opt/xAppManager