diff options
author | Thomas Nelson arthudent3 <nelson24@att.com> | 2019-06-19 22:19:10 +0000 |
---|---|---|
committer | Thomas Nelson arthudent3 <nelson24@att.com> | 2019-06-25 13:20:59 +0000 |
commit | 881f14bc8676cedd68e17bd007a869fa85578fa1 (patch) | |
tree | 0dc37c36af2483d5d0925dd84993f93f344688f8 /distribution | |
parent | 078f69315e4b4faffc50e1c7dfde717396e48194 (diff) |
Some bug fixes and Minor Chages.
Remove some Commented out code.
Cleaned up Variables.
Encryption of passwords added
Updated Test Cases
Fixed some errors in how they were reported.
Reduced Logging clutter
Some Vulnerability fixes.
Change-Id: I64c7935d167d4a976681b5a18fd51aa667d0cd95
Issue-ID: MUSIC-413
Signed-off-by: Thomas Nelson arthudent3 <nelson24@att.com>
Diffstat (limited to 'distribution')
-rw-r--r-- | distribution/music/Dockerfile | 2 | ||||
-rw-r--r-- | distribution/music/build.sh | 10 | ||||
-rw-r--r-- | distribution/music/startup.sh | 8 |
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} |