From 95c9918c9af034b122b8b646fbd2f2d3a13113f9 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mhermeling@grammatech.com>
Date: Thu, 1 Apr 2021 15:32:48 +0000
Subject: [PATCH 1/4] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 83942ae..de27b22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ ARG BASE_TAG=8.3
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ENV HUB_DEFAULT_PWD=HubSecretPasswd
-
+RUN HUB_DEFAULT_PWD=$(echo date +%s | sha256sum | base64 | head -c 32)
+    
 
 RUN yum -y update \
   && yum clean all
-- 
GitLab


From fbb32b5e9f7156bcf39385367c84095d622d4b79 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mhermeling@grammatech.com>
Date: Thu, 1 Apr 2021 15:36:55 +0000
Subject: [PATCH 2/4] Update codesonar-exec.sh

---
 scripts/codesonar-exec.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/codesonar-exec.sh b/scripts/codesonar-exec.sh
index d87f1de..bd1776c 100644
--- a/scripts/codesonar-exec.sh
+++ b/scripts/codesonar-exec.sh
@@ -3,10 +3,11 @@
 
 echo "Starting hub in /home/codesonar/hub"
 echo -e "$1\n$1\n" | /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+echo "Hub password is $1"
 
 echo "Hub started..."
 while [ 1 ]
 do
 echo "Hub running"
 sleep 60
-done
\ No newline at end of file
+done
-- 
GitLab


From ca7787ef5d1cfe6c37639036a68fd1abdfc7dff7 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mhermeling@grammatech.com>
Date: Thu, 1 Apr 2021 16:39:19 +0000
Subject: [PATCH 3/4] Change from hard-coded default password to generated
 default passwd

---
 scripts/codesonar-exec.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/codesonar-exec.sh b/scripts/codesonar-exec.sh
index bd1776c..c47308c 100644
--- a/scripts/codesonar-exec.sh
+++ b/scripts/codesonar-exec.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
   
-
-echo "Starting hub in /home/codesonar/hub"
-echo -e "$1\n$1\n" | /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
-echo "Hub password is $1"
+  
+if test -f "/home/codesonar/hub/hubpwd"; then
+   echo "Starting hub in /home/codesonar/hub with existing pwd"
+   /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+else
+   HUB_DEFAULT_PWD=$(date +%s | base64 | head -c 32)
+   echo "${HUB_DEFAULT_PWD}" > /home/codesonar/hub/hubpwd
+   chmod 600 /home/codesonar/hub/hubpwd
+   echo "Starting hub with new hub password: ${HUB_DEFAULT_PWD}"
+   echo -e "${HUB_DEFAULT_PWD}\n${HUB_DEFAULT_PWD}\n" |  /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+fi
 
 echo "Hub started..."
 while [ 1 ]
-- 
GitLab


From 882dd632e5e63fcda98cb567a5150e4f38f6f4c2 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mhermeling@grammatech.com>
Date: Thu, 1 Apr 2021 16:39:50 +0000
Subject: [PATCH 4/4] Remove default pwd

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de27b22..bf33b23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,6 @@ ARG BASE_TAG=8.3
 #change this for deployment!!!
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-
-RUN HUB_DEFAULT_PWD=$(echo date +%s | sha256sum | base64 | head -c 32)
     
 
 RUN yum -y update \
@@ -83,4 +81,4 @@ USER codesonar
 WORKDIR /home/codesonar
 
 EXPOSE 7340/tcp
-CMD ["sh", "-c", "/opt/codesonar-exec.sh $HUB_DEFAULT_PWD"]
+CMD ["sh", "-c", "/opt/codesonar-exec.sh"]
-- 
GitLab