summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/src/main
diff options
context:
space:
mode:
authorJimmy Forsyth <jf2512@att.com>2019-09-04 14:19:59 -0400
committerJimmy Forsyth <jf2512@att.com>2019-09-04 14:20:02 -0400
commit9b556ab194279fed6fbc7b29a6d043fb6ecf19f7 (patch)
treecdd5cde1f2b21990a360f23a122c37c38b5ab25b /sparkybe-onap-application/src/main
parent21730cb59e91849d6ca2ff5449cfeb4f5fa2d6fd (diff)
Cherry-pick review #92777 for elalto5.1.0-ONAP5.0.2-ONAP5.0.1-ONAPelalto
Issue-ID: INT-1150 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I942a148f9bed098e9e79513765d44ef3e231bf3b
Diffstat (limited to 'sparkybe-onap-application/src/main')
-rw-r--r--sparkybe-onap-application/src/main/assembly/descriptor.xml46
-rw-r--r--sparkybe-onap-application/src/main/docker/Dockerfile34
-rw-r--r--sparkybe-onap-application/src/main/scripts/start.sh4
3 files changed, 54 insertions, 30 deletions
diff --git a/sparkybe-onap-application/src/main/assembly/descriptor.xml b/sparkybe-onap-application/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..0636952
--- /dev/null
+++ b/sparkybe-onap-application/src/main/assembly/descriptor.xml
@@ -0,0 +1,46 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>build</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/config</directory>
+ <outputDirectory>/config</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/auth/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/scripts</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/static</directory>
+ <outputDirectory>/static</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>Dockerfile</exclude>
+ <exclude>*.sh</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile
index 53dc9c3..23cdb7c 100644
--- a/sparkybe-onap-application/src/main/docker/Dockerfile
+++ b/sparkybe-onap-application/src/main/docker/Dockerfile
@@ -1,38 +1,14 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
ARG MICRO_HOME=/opt/app/sparky
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
-## 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
-## Setup JAVA_HOME, this is useful for docker commandline
-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
-RUN mkdir -p $BIN_HOME
-RUN mkdir -p $MICRO_HOME/config/
-RUN mkdir -p $MICRO_HOME/lib/
-RUN mkdir -p $MICRO_HOME/static/
-
-ADD *.jar $MICRO_HOME/lib/
-ADD scripts/* $MICRO_HOME/bin/
-COPY static/ $MICRO_HOME/static/
-COPY config/ $MICRO_HOME/config/
-
-COPY oxm $MICRO_HOME/
-
-RUN chmod 755 $MICRO_HOME/bin/*
-RUN chmod 755 $MICRO_HOME/lib/*
-RUN chmod 755 $MICRO_HOME/static/*
-RUN chmod 755 $MICRO_HOME/config/*
-
-RUN ln -s /logs $MICRO_HOME/logs
+WORKDIR $MICRO_HOME
+COPY /maven/sparkybe-onap-application/ .
+RUN chmod 755 $BIN_HOME/* \
+ && ln -snf /logs $MICRO_HOME/logs
EXPOSE 8000 8000
EXPOSE 9517 9517
diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh
index 8369d6c..939f476 100644
--- a/sparkybe-onap-application/src/main/scripts/start.sh
+++ b/sparkybe-onap-application/src/main/scripts/start.sh
@@ -6,7 +6,9 @@ CONFIG_HOME=${APP_HOME}/config
PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME} -Dlogging.config=${CONFIG_HOME}/logging/logback.xml"
set -x
-jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/portal.properties -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/key.properties
+jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar \
+ -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/portal.properties \
+ -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/key.properties > /dev/null 2>&1
#
# change the working directory so that Spring-Boot will pick up the config folder from the right path