diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2017-07-12 16:14:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-12 16:14:24 +0000 |
| commit | 335773f2cb017ee1ce0dbe173a2da1819c083bfd (patch) | |
| tree | 86642b7d6e7aa73609bbf9fe27636c4ded969fd7 | |
| parent | 99565bb6bd87cfc46591cea73985c58c3a3697dd (diff) | |
| parent | 19de351f906523ed86b0221ebea33a8ac2bac9bc (diff) | |
Merge "Fix ep:1610-1 build process"
| -rw-r--r-- | deliveries/os_Dockerfile | 4 | ||||
| -rwxr-xr-x | deliveries/os_build_febe.sh | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile index 56faa6ad..36ecd85f 100644 --- 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 2d6117c3..fa66f267 100755 --- 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 |