Merge "Fix ep:1610-1 build process"

diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile
index 56faa6a..36ecd85 100644 (file)
--- a/deliveries/os_Dockerfile
+++ b/deliveries/os_Dockerfile
@@ -23,7 +23,7 @@ RUN locale-gen $LANG
 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 +77,7 @@ COPY configure-and-run.sh /PROJECT/OpenSource/UbuntuEP/
 
 #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 --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
index 2d6117c..fa66f26 100755 (executable)
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -36,9 +36,6 @@ cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk
 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 @@ cd $PROJECTDIR/ecomp-sdk/epsdk-app-os
 
 ${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