From ce701746049abfd94a87b46e43f296faf32d6213 Mon Sep 17 00:00:00 2001
From: Shwetank Dave <shwetank.dave@amdocs.com>
Date: Thu, 29 Mar 2018 16:55:36 -0400
Subject: Removing AJSC and moving to SpringBoot

[AAI-804] Deleting AJSC files.
[AAI-804] Adding Spring Boot Dependencies

Issue-ID: AAI-804

Change-Id: Ibda01496d56cc4613f6d2be3b8737d823cee342a
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
---
 src/main/docker/Dockerfile | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'src/main/docker/Dockerfile')

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 3198bb1..1b0ce46 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,21 +1,22 @@
-FROM ubuntu:14.04
+# FROM ubuntu:14.04
+FROM onap/search-service:0.0.1
 
 ARG MICRO_HOME=/opt/app/search-data-service
 ARG BIN_HOME=$MICRO_HOME/bin
 
-RUN apt-get update
+# RUN apt-get update
 
-# Install and setup java8
-RUN apt-get update && apt-get install -y software-properties-common
+## Install and setup java8
+# 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
-ADD swm/package/nix/dist_files/appl/search-data-service/* $MICRO_HOME/
+ADD search-data-service* $MICRO_HOME/
 RUN mkdir -p $BIN_HOME
 COPY *.sh $BIN_HOME
 RUN chmod 755 $BIN_HOME/*
@@ -23,4 +24,16 @@ RUN ln -s /logs $MICRO_HOME/logs
 
 EXPOSE 9509 9509
 
-CMD ["/opt/app/search-data-service/bin/start.sh"]
+# 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
-- 
cgit 1.2.3-korg