aboutsummaryrefslogtreecommitdiffstats
path: root/distribution
diff options
context:
space:
mode:
Diffstat (limited to 'distribution')
-rw-r--r--distribution/music/Dockerfile2
-rw-r--r--distribution/music/build.sh10
-rw-r--r--distribution/music/startup.sh8
3 files changed, 8 insertions, 12 deletions
diff --git a/distribution/music/Dockerfile b/distribution/music/Dockerfile
index c3253ae0..fcfb05fd 100644
--- a/distribution/music/Dockerfile
+++ b/distribution/music/Dockerfile
@@ -21,7 +21,7 @@
FROM openjdk:8
LABEL purpose="Springboot for MUSIC"
-RUN apt update && apt install -y netcat telnet vim vim-common
+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
diff --git a/distribution/music/build.sh b/distribution/music/build.sh
deleted file mode 100644
index 21e45268..00000000
--- a/distribution/music/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ "${1}" ]; then
-
-docker build -t dockercentral.it.att.com:5100/com.att.music/music-sb:${1} .
-docker tag dockercentral.it.att.com:5100/com.att.music/music-sb:${1} dockercentral.it.att.com:5100/com.att.music/music-sb:latest
-docker push dockercentral.it.att.com:5100/com.att.music/music-sb:latest
-docker push dockercentral.it.att.com:5100/com.att.music/music-sb:${1}
-else
-echo "Missing version"
-
-fi
diff --git a/distribution/music/startup.sh b/distribution/music/startup.sh
index 420436c0..a6d8308e 100644
--- a/distribution/music/startup.sh
+++ b/distribution/music/startup.sh
@@ -32,5 +32,11 @@ else
PASSWORD=changeit
echo "#### Using Default Password for Certs" >> ${LOGFILE}
fi
+if [ ${EXTAP} ]; then
+ if [ "${EXTAP_FILE}" != "" ]; 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}
-java -jar MUSIC.jar --server.ssl.key-store-password="${PASSWORD}" --aaf_password="enc:${PASSWORD}" 2>&1 | tee ${LOGFILE}