From 76f600628b9e41f6fcddc0926f276e4fe15355e8 Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Thu, 5 Sep 2019 16:11:42 -0400 Subject: Rename springboot jar Jars are now MUSIC-SB.jar for springboot packaged jar and MUSIC.jar for music jar Change-Id: I9348d43227983b45c74a728862fc5608831e033c Issue-ID: MUSIC-466 Signed-off-by: Tschaen, Brendan --- distribution/music/Dockerfile | 2 +- distribution/music/startup.sh | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/music/Dockerfile b/distribution/music/Dockerfile index fcfb05fd..98e8ea41 100644 --- a/distribution/music/Dockerfile +++ b/distribution/music/Dockerfile @@ -24,7 +24,7 @@ LABEL purpose="Springboot for MUSIC" RUN apt-get update && apt-get install -y netcat telnet vim vim-common curl RUN groupadd --gid 1000 music && useradd --gid 1000 --uid 1000 music RUN mkdir -p /opt/app/music/logs/MUSIC -COPY MUSIC.jar /opt/app/music +COPY MUSIC-SB.jar /opt/app/music COPY startup.sh /opt/app/music RUN mkdir -p /opt/app/music/logs && \ chown -R music:music /opt/app/music/ && \ diff --git a/distribution/music/startup.sh b/distribution/music/startup.sh index a6d8308e..61536832 100644 --- a/distribution/music/startup.sh +++ b/distribution/music/startup.sh @@ -37,6 +37,6 @@ if [ ${EXTAP} ]; then EXTAP_OPTION="--spring.config.location=file:${EXTAP_FILE}" fi fi -echo "java -jar MUSIC.jar ${EXTAP_OPTION} --server.ssl.key-store-password=${PASSWORD} --aaf_password=enc:${PASSWORD} 2>&1 | tee ${LOGFILE}" -java -jar MUSIC.jar ${EXTAP_OPTION} --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE} +echo "java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password=${PASSWORD} --aaf_password=enc:${PASSWORD} 2>&1 | tee ${LOGFILE}" +java -jar MUSIC-SB.jar ${EXTAP_OPTION} --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE} diff --git a/pom.xml b/pom.xml index 085d3b7f..406e7864 100755 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,6 @@ - ${project.artifactId} src/main/java src/main/webapp/WEB-INF/classes @@ -146,6 +145,7 @@ org.onap.music.MusicApplication ./distribution/music/ true + ${project.artifactId}-SB -- cgit 1.2.3-korg