X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=Dockerfile;h=ef526e8e5d90abe9a6be500e28cb1e6c78b261c2;hb=d976977f297fbdb209760b328e271777f565f02a;hp=fcf2abd0764d76e1fc62742e76c39b1a00d766f0;hpb=059775ccd9e7c5482747729890800f7a7d507a94;p=ric-plt%2Fappmgr.git

diff --git a/Dockerfile b/Dockerfile
index fcf2abd..ef526e8 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,159 +14,83 @@
 #   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
 
-#
-# rancodev libs
-#
-RUN mkdir -p /opt/build \
-    && cd /opt/build && git clone https://gerrit.oran-osc.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 log/ ; ./autogen.sh ; ./configure ; make ; make install \
-    && ldconfig
-
-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}"
 ENV GOPATH="/go"
 
+# Swagger
+RUN mkdir -p /go/bin
+RUN cd /go/bin \
+    && wget --quiet https://github.com/go-swagger/go-swagger/releases/download/v0.19.0/swagger_linux_amd64 \
+    && mv swagger_linux_amd64 swagger \
+    && chmod +x swagger
+
+RUN mkdir -p /go/src/ws
+WORKDIR "/go/src/ws"
+
 # Module prepare (if go.mod/go.sum updated)
-COPY go.mod /go/src/${PACKAGEURL}
-COPY go.sum /go/src/${PACKAGEURL}
+COPY go.mod /go/src/ws
+COPY go.sum /go/src/ws
 RUN GO111MODULE=on go mod download
 
-# build
-COPY . /go/src/${PACKAGEURL}
-RUN make -C /go/src/${PACKAGEURL} build
-
-CMD ["/bin/bash"]
+# build and test
+COPY . /go/src/ws
 
+# Generate Swagger code
+RUN /go/bin/swagger generate server -f api/appmgr_rest_api.yaml --name AppManager -t pkg/ --exclude-main
 
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_unit
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test"]
+COPY . /go/src/ws
 
+# Build the code
+RUN GO111MODULE=on GO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/src/ws/cache/go/cmd/appmgr cmd/appmgr.go
 
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_fmt
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["make","go-test-fmt"]
+# Run unit tests
+RUN GO111MODULE=on GO_ENABLED=0 GOOS=linux go test -p 1 -cover ./pkg/cm/ ./pkg/helm/ ./pkg/resthooks/
 
-#----------------------------------------------------------
-#
-#----------------------------------------------------------
-FROM appmgr-build as appmgr-test_sanity
-ARG PACKAGEURL
-WORKDIR "/go/src/${PACKAGEURL}"
-CMD ["jq","-s",".", "api/appmgr_rest_api.json"]
+RUN gofmt -l $(find cmd/ pkg/  -name '*.go' -not -name '*_test.go')
 
+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
 
 #
-# xApp
+# xApp Manager
 #
 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 /go/src/ws/cache/go/cmd/appmgr /opt/xAppManager/appmgr
 
 WORKDIR /opt/xAppManager