From c528fef52cf50f9d52a1384388470517b27fbcb0 Mon Sep 17 00:00:00 2001
From: Will Mooreston <97046018+labkey-willm@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:53:00 -0700
Subject: [PATCH] fixup files mount issues (#155)

* better teamcity output when smoke test fails

* fix perms of LABKEY_HOME/files and logs

* undo fix perms of LABKEY_HOME/files and logs

* export LABKEY_EXTERNAL_MODULES so application.properties gets it filled in properly

* remove files mount from docker-compose
---
 docker-compose.yml | 8 ++++----
 entrypoint.sh      | 1 +
 smoke.bash         | 3 +++
 3 files changed, 8 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:
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}"
 
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