Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix ep:1610-1 build process"
[portal.git]
/
deliveries
/
os_Dockerfile
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 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/
# 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
#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"]
# Define default command.
#CMD ["bash"]
CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"]