From 53f74c151b3adb7453a17a37eed92b589052b849 Mon Sep 17 00:00:00 2001
From: Tommy McNeely <thomas.mcneely@davita.com>
Date: Thu, 15 Nov 2018 10:10:27 -0700
Subject: [PATCH] Fix license doesn't install on first run

---
 dc-os/Docker/HA/run.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dc-os/Docker/HA/run.sh b/dc-os/Docker/HA/run.sh
index 62ce5dd..a8c8717 100755
--- a/dc-os/Docker/HA/run.sh
+++ b/dc-os/Docker/HA/run.sh
@@ -51,7 +51,6 @@ function setInitialConfiguration {
     # This configuration doesn't exist on the first run
     if [ ! -f /var/opt/jfrog/artifactory/etc/artifactory.config.bootstrap.xml ]; then
         sed -i -e "s,\[SERVERNAME\],$ART_SERVER_NAME,g" /tmp/artifactory.config.xml
-        sed -i -e "s,\[ARTSERVICE\],${MARATHON_APP_ID:1},g" /tmp/artifactory.config.xml
         sed -i -e "s,\[RPMETHOD\],$ART_REVERSE_PROXY_METHOD,g" /tmp/artifactory.config.xml
         sed -i -e "s,\[PORT\],$INSTANCE_PORT,g" /tmp/artifactory.config.xml
         mv /tmp/artifactory.config.xml /var/opt/jfrog/artifactory/etc/artifactory.config.import.xml
@@ -71,8 +70,8 @@ function setInitialConfiguration {
 #Set license
 function setLicense {
     logger "Setting up license."
-    [ ! -d /var/opt/jfrog/artifactory/etc ] && mkdir -p /var/opt/jfrog/artifactory/etc
     echo -n "$ART_LICENSES" | cut -d, -f1 > /var/opt/jfrog/artifactory/etc/artifactory.lic
+    chmod 777 /var/opt/jfrog/artifactory/etc/artifactory.lic
     echo "Added license"
 }
 
@@ -113,4 +112,4 @@ setInstanceIp
 setNodeId
 setInitialConfiguration
 
-/entrypoint-artifactory.sh
+/entrypoint-artifactory.sh
\ No newline at end of file