Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion packages/umbreld/source/modules/apps/legacy-compat/app-script
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,11 @@ compose() {
compose_files+=( "--file" "${common_compose_file}" )
compose_files+=( "--file" "${app_compose_file}" )

# Add override compose file if it exists
if [[ -f "${app_data_dir}/docker-compose.override.yml" ]]; then
compose_files+=(--file "${app_data_dir}/docker-compose.override.yml")
fi

# Merge compose files and args. passed into 'compose'
compose_args=("${compose_files[@]}" "${@}")

Expand Down Expand Up @@ -777,4 +782,4 @@ fi
# If we get here it means no valid command was supplied
# Show help and exit
show_help
exit 1
exit 1
1 change: 1 addition & 0 deletions scripts/update-script
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
export PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"

# This script is used to bootstrap the mender update process
# The update server references it in the form:
Expand Down