diff --git a/packages/umbreld/source/modules/apps/legacy-compat/app-script b/packages/umbreld/source/modules/apps/legacy-compat/app-script old mode 100755 new mode 100644 index 78572995d..2bc03ef20 --- a/packages/umbreld/source/modules/apps/legacy-compat/app-script +++ b/packages/umbreld/source/modules/apps/legacy-compat/app-script @@ -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[@]}" "${@}") @@ -777,4 +782,4 @@ fi # If we get here it means no valid command was supplied # Show help and exit show_help -exit 1 \ No newline at end of file +exit 1 diff --git a/scripts/update-script b/scripts/update-script index 9a51aff04..cfc42c095 100755 --- a/scripts/update-script +++ b/scripts/update-script @@ -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: