diff options
| author |   Victor Morales <victor.morales@intel.com> | 2017-07-03 16:23:17 -0500 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2017-07-05 09:21:50 -0500 |
| commit | 19de351f906523ed86b0221ebea33a8ac2bac9bc (patch) | |
| tree | d0e06cce7f7684b812da2d009b38f7ca6cabaf33 | |
| parent | c42a93827465f2e839b1162f72c6833df1a1529b (diff) | |
Fix ep:1610-1 build process
The current process refers to two non-existing folders. When the
build process tries to use those folders fails and the image is
not created. Apparently the compilation order of ecomp-portal-FE-os
depends on epsdk-app-os. Lastly, the installation of openjdk-8-jdk
requires the --force-yes flag.
Change-Id: If998393cd90a6f4a31806699423e90bfd0df8f30
Signed-off-by: Victor Morales <victor.morales@intel.com>
| -rw-r--r-- | deliveries/os_Dockerfile | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | deliveries/os_build_febe.sh | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile index efba0bdd..b322b547 100644 --- a/deliveries/os_Dockerfile +++ b/deliveries/os_Dockerfile @@ -14,7 +14,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/ @@ -68,7 +68,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 a87831af..fee4f2d4 100644..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 |