diff options
| author |   Tschaen, Brendan <ctschaen@att.com> | 2019-09-05 16:11:42 -0400 |
|---|---|---|
| committer | Tschaen, Brendan <ctschaen@att.com> | 2019-09-05 16:11:42 -0400 |
| commit | 76f600628b9e41f6fcddc0926f276e4fe15355e8 (patch) | |
| tree | 25d6b6cbd1945d18e9ab0c55ad1668853c48da08 | |
| parent | 6aad1c6198726b0e7963db363ea0cfc28e93fcd5 (diff) | |
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 <ctschaen@att.com>
| -rw-r--r-- | distribution/music/Dockerfile | 2 | ||||
| -rw-r--r-- | distribution/music/startup.sh | 4 | ||||
| -rwxr-xr-x | 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} @@ -111,7 +111,6 @@ </repositories> <build> - <!-- <finalName>${project.artifactId}-${project.version}-${timestamp}</finalName>--> <finalName>${project.artifactId}</finalName> <sourceDirectory>src/main/java</sourceDirectory> <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> @@ -146,6 +145,7 @@ <mainClass>org.onap.music.MusicApplication</mainClass> <outputDirectory>./distribution/music/</outputDirectory> <addResources>true</addResources> + <finalName>${project.artifactId}-SB</finalName> </configuration> <executions> <execution> |