From b5a8a76f1095a96244b6d50d7529c6acc0d227bf Mon Sep 17 00:00:00 2001
From: Will Mooreston <willm@labkey.com>
Date: Tue, 5 Aug 2025 16:15:47 -0700
Subject: [PATCH 1/5] better teamcity output when smoke test fails

---
 smoke.bash | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/smoke.bash b/smoke.bash
index 266bf37..072b6f8 100755
--- a/smoke.bash
+++ b/smoke.bash
@@ -14,6 +14,9 @@ function main() {
     RETRIES=$(( RETRIES + 1 ))
 
     if [ "$RETRIES" -ge 5 ]; then
+      printf "##teamcity[buildProblem description='%s' identity='%s']\n" \
+			'Cannot connect to localhost. Dumping docker logs:' \
+			'failure'
       docker logs ${BUILD_DISTRIBUTION:-labkey}
       exit 1
     fi

From 81686b9ab2c885280191c5dbe419e74ebc6c8dfb Mon Sep 17 00:00:00 2001
From: Will Mooreston <willm@labkey.com>
Date: Tue, 5 Aug 2025 16:17:47 -0700
Subject: [PATCH 2/5] fix perms of LABKEY_HOME/files and logs

---
 entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index 68790c0..6eb4123 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -259,6 +259,9 @@ main() {
         -Djava.rmi.server.hostname=${JAVA_RMI_SERVER_HOSTNAME}" 
   fi
 
+  echo "Fixing permissions of $LABKEY_HOME/files and $LABKEY_HOME/logs"
+  chown -Rc labkey:labkey "${LABKEY_HOME}/files" "${LABKEY_HOME}/logs";
+
   echo "Creating new heap/error log directory..."
   HEAP_AND_ERROR_PATH="$LABKEY_HOME/files/heap_dumps_and_errors_$(date +%Y%m%d_%H%M%S)"
   mkdir -pv $HEAP_AND_ERROR_PATH

From e66c30af82c6f264cf821458c19f2a6420cb962c Mon Sep 17 00:00:00 2001
From: Will Mooreston <willm@labkey.com>
Date: Wed, 6 Aug 2025 11:20:38 -0700
Subject: [PATCH 3/5] undo fix perms of LABKEY_HOME/files and logs

---
 entrypoint.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 6eb4123..68790c0 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -259,9 +259,6 @@ main() {
         -Djava.rmi.server.hostname=${JAVA_RMI_SERVER_HOSTNAME}" 
   fi
 
-  echo "Fixing permissions of $LABKEY_HOME/files and $LABKEY_HOME/logs"
-  chown -Rc labkey:labkey "${LABKEY_HOME}/files" "${LABKEY_HOME}/logs";
-
   echo "Creating new heap/error log directory..."
   HEAP_AND_ERROR_PATH="$LABKEY_HOME/files/heap_dumps_and_errors_$(date +%Y%m%d_%H%M%S)"
   mkdir -pv $HEAP_AND_ERROR_PATH

From ddaafda864bb986946ee26bafe752e1cef7ac297 Mon Sep 17 00:00:00 2001
From: Will Mooreston <willm@labkey.com>
Date: Wed, 6 Aug 2025 14:53:00 -0700
Subject: [PATCH 4/5] export LABKEY_EXTERNAL_MODULES so application.properties
 gets it filled in properly

---
 entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index 68790c0..400abfa 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -31,6 +31,7 @@ PURGE_MTNC_LOGS_OLDER_THAN_DAYS="${PURGE_MTNC_LOGS_OLDER_THAN_DAYS:-90}"
  
 # set path to external modules)
 LABKEY_EXTERNAL_MODULES="${LABKEY_EXTERNAL_MODULES:-/labkey/files/externalModules}"
+export LABKEY_EXTERNAL_MODULES=$LABKEY_EXTERNAL_MODULES
 
 SLEEP="${SLEEP:=0}"
 

From 4a1dc5234b8c3a785fd2994eee2998218b722ccb Mon Sep 17 00:00:00 2001
From: Will Mooreston <willm@labkey.com>
Date: Thu, 7 Aug 2025 09:38:10 -0700
Subject: [PATCH 5/5] remove files mount from docker-compose

---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 206ca96..f56b76a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     ports:
       - ${HOST_PORT:-8443}:8443
     volumes:
-      - ./mounts/files:/labkey/files
+      # - ./mounts/files:/labkey/files
       # - files:/labkey/files
       - ./mounts/logs:/labkey/logs
     environment:
@@ -129,7 +129,7 @@ services:
     ports:
       - ${HOST_PORT:-8443}:8443
     volumes:
-      - ./mounts/files:/labkey/files
+      # - ./mounts/files:/labkey/files
       # - files:/labkey/files
       - ./mounts/logs:/labkey/logs
     environment:
@@ -240,7 +240,7 @@ services:
     ports:
       - ${HOST_PORT:-8443}:8443
     volumes:
-      - ./mounts/files:/labkey/files
+      # - ./mounts/files:/labkey/files
       # - files:/labkey/files
       - ./mounts/logs:/labkey/logs
     environment:
@@ -352,7 +352,7 @@ services:
       - ${HOST_PORT:-8443}:8443
       - 7199:7199
     volumes:
-      - ./mounts/files:/labkey/files
+      # - ./mounts/files:/labkey/files
       # - files:/labkey/files
       - ./mounts/logs:/labkey/logs
     environment: