Skip to content

Commit 9e6a3cd

Browse files
authored
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
1 parent e6622f8 commit 9e6a3cd

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
ports:
1717
- ${HOST_PORT:-8443}:8443
1818
volumes:
19-
- ./mounts/files:/labkey/files
19+
# - ./mounts/files:/labkey/files
2020
# - files:/labkey/files
2121
- ./mounts/logs:/labkey/logs
2222
environment:
@@ -129,7 +129,7 @@ services:
129129
ports:
130130
- ${HOST_PORT:-8443}:8443
131131
volumes:
132-
- ./mounts/files:/labkey/files
132+
# - ./mounts/files:/labkey/files
133133
# - files:/labkey/files
134134
- ./mounts/logs:/labkey/logs
135135
environment:
@@ -240,7 +240,7 @@ services:
240240
ports:
241241
- ${HOST_PORT:-8443}:8443
242242
volumes:
243-
- ./mounts/files:/labkey/files
243+
# - ./mounts/files:/labkey/files
244244
# - files:/labkey/files
245245
- ./mounts/logs:/labkey/logs
246246
environment:
@@ -352,7 +352,7 @@ services:
352352
- ${HOST_PORT:-8443}:8443
353353
- 7199:7199
354354
volumes:
355-
- ./mounts/files:/labkey/files
355+
# - ./mounts/files:/labkey/files
356356
# - files:/labkey/files
357357
- ./mounts/logs:/labkey/logs
358358
environment:

entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ PURGE_MTNC_LOGS_OLDER_THAN_DAYS="${PURGE_MTNC_LOGS_OLDER_THAN_DAYS:-90}"
3131

3232
# set path to external modules)
3333
LABKEY_EXTERNAL_MODULES="${LABKEY_EXTERNAL_MODULES:-/labkey/files/externalModules}"
34+
export LABKEY_EXTERNAL_MODULES=$LABKEY_EXTERNAL_MODULES
3435

3536
SLEEP="${SLEEP:=0}"
3637

smoke.bash

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ function main() {
1414
RETRIES=$(( RETRIES + 1 ))
1515

1616
if [ "$RETRIES" -ge 5 ]; then
17+
printf "##teamcity[buildProblem description='%s' identity='%s']\n" \
18+
'Cannot connect to localhost. Dumping docker logs:' \
19+
'failure'
1720
docker logs ${BUILD_DISTRIBUTION:-labkey}
1821
exit 1
1922
fi

0 commit comments

Comments
 (0)