Skip to content

fixup files mount issues #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 7, 2025
Merged

fixup files mount issues #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5a8a76
better teamcity output when smoke test fails
labkey-willm Aug 5, 2025
81686b9
fix perms of LABKEY_HOME/files and logs
labkey-willm Aug 5, 2025
e66c30a
undo fix perms of LABKEY_HOME/files and logs
labkey-willm Aug 6, 2025
ddaafda
export LABKEY_EXTERNAL_MODULES so application.properties gets it fill…
labkey-willm Aug 6, 2025
4a1dc52
remove files mount from docker-compose
labkey-willm Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
3 changes: 3 additions & 0 deletions smoke.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down