From d947be024297ca589b11b1f0121d715003ea887e Mon Sep 17 00:00:00 2001 From: Shwetank Dave Date: Tue, 3 Apr 2018 16:30:01 -0400 Subject: [AAI-804] Updating files to fix search service. Issue-ID: AAI-804 Change-Id: Ie50f821cd235ccd5c627c11294da4b29bf29fc16 Signed-off-by: Shwetank Dave --- src/main/docker/Dockerfile | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'src/main/docker/Dockerfile') 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"] -- cgit 1.2.3-korg