diff options
author | Shwetank Dave <shwetank.dave@amdocs.com> | 2018-04-03 16:30:01 -0400 |
---|---|---|
committer | Shwetank Dave <shwetank.dave@amdocs.com> | 2018-04-03 17:49:28 -0400 |
commit | d947be024297ca589b11b1f0121d715003ea887e (patch) | |
tree | d5f82b16d10711bcc9103801c85b0f1b50ee6680 /src/main/docker | |
parent | ce701746049abfd94a87b46e43f296faf32d6213 (diff) |
[AAI-804] Updating files to fix search service.
Issue-ID: AAI-804
Change-Id: Ie50f821cd235ccd5c627c11294da4b29bf29fc16
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
Diffstat (limited to 'src/main/docker')
-rw-r--r-- | src/main/docker/Dockerfile | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 1b0ce46..1fccaf4 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,18 +1,15 @@ -# FROM ubuntu:14.04 -FROM onap/search-service:0.0.1 +FROM ubuntu:14.04 ARG MICRO_HOME=/opt/app/search-data-service ARG BIN_HOME=$MICRO_HOME/bin -# RUN apt-get update - ## Install and setup java8 -# RUN apt-get update && apt-get install -y software-properties-common +RUN apt-get update && apt-get install -y software-properties-common ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step -# RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk +RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk ## Setup JAVA_HOME, this is useful for docker commandline -# ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64 -# RUN export JAVA_HOME +ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64 +RUN export JAVA_HOME # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME @@ -24,16 +21,4 @@ RUN ln -s /logs $MICRO_HOME/logs EXPOSE 9509 9509 -# CMD ["/opt/app/search-data-service/bin/start.sh"] - - -# COPY search-data-service-1.2.0-SNAPSHOT.jar / -## Tomcat keystore will be mapped in via mounted volumes. -##COPY tomcat_keystore / -####COPY onap-cert.crt / -####COPY client-cert-onap.p12 / -#COPY start.sh / -## RUN chmod +x start.sh - -EXPOSE 5443 5443 -EXPOSE 8000 8000 +CMD ["/opt/app/search-data-service/bin/start.sh"] |