fixup files mount issues (#155) (#156)

* better teamcity output when smoke test fails

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

* remove files mount from docker-compose

Author: labkey-willm

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:

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}"
 

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