Merge "Fix ep:1610-1 build process"

diff --combined deliveries/os_Dockerfile
index 56faa6a,b322b54..36ecd85
--- 1/deliveries/os_Dockerfile
--- 2/deliveries/os_Dockerfile
+++ b/deliveries/os_Dockerfile
@@@ -3,15 -3,6 +3,15 @@@
  
  FROM ubuntu:14.04
  
 +ARG HTTP_PROXY=${HTTP_PROXY}
 +ARG HTTPS_PROXY=${HTTPS_PROXY}
 +
 +ENV http_proxy $HTTP_PROXY
 +ENV https_proxy $HTTPS_PROXY
 +
 +RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
 +    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
 +
  # Install the python script required for "add-apt-repository"
  RUN apt-get update && apt-get install -y software-properties-common
  
@@@ -23,7 -14,7 +23,7 @@@ RUN locale-gen $LAN
  RUN add-apt-repository ppa:openjdk-r/ppa
  
  # Install java8
- RUN apt-get update && apt-get install -y openjdk-8-jdk
+ RUN apt-get update && apt-get install -y --force-yes openjdk-8-jdk
  
  # Setup JAVA_HOME, this is useful for docker commandline
  ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
@@@ -77,7 -68,7 +77,7 @@@ COPY configure-and-run.sh /PROJECT/Open
  
  #RUN cp -r ${FE_DIR}/dist/public  ${SDKHOME}/public
  
- COPY ${FE_DIR}/dist/public ${SDKHOME}/public 
+ COPY ${FE_DIR}/dist/public ${SDKHOME}
  # Define default command.
  #CMD ["bash"]
  CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"]

diff --combined deliveries/os_build_febe.sh
index 2d6117c,fee4f2d..fa66f26
--- 1/deliveries/os_build_febe.sh
--- 2/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@@ -36,9 -36,6 +36,6 @@@ cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/
  shopt -s expand_aliases
  source ~/.bashrc
  
- cd $PROJECTDIR/ecomp-portal-FE-os/
- 
- ${MVN} clean install
  
  cd $PROJECTDIR/ecomp-portal-BE-common
  
@@@ -55,7 -52,11 +52,11 @@@ cd $PROJECTDIR/ecomp-sdk/epsdk-app-o
  
  ${MVN} install
  
- mv target/epsdk-app-os-1.1.0-SNAPSHOT target/ep-sdk-app
+ cd $PROJECTDIR/ecomp-portal-FE-os/
+ 
+ ${MVN} install
+ 
+ mv target/epsdk-app-os-1.1.0 target/ep-sdk-app
  
  # now install DBC app
  cd $SOURCEDIR
@@@ -84,14 -85,5 +85,14 @@@ cat dbca-create-mysql-1707-os.sql ../..
  # install into docker
  cd $CURRENTDIR
  
 -echo "running: docker build -t ${IMGNAME}  --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
 -docker build -t ${IMGNAME}  --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile .
 +PROXY_ARGS=""
 +if [ $HTTP_PROXY ]; then
 +    PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}"
 +fi
 +if [ $HTTPS_PROXY ]; then
 +    PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
 +fi
 +
 +EXEC_CMD="docker build -t ${IMGNAME} ${PROXY_ARGS} --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
 +echo $EXEC_CMD
 +$EXEC_CMD