Skip to content

Commit

Permalink
Merge pull request #55 from thin-edge/fix-custom-docker-host
Browse files Browse the repository at this point in the history
fix: custom DOCKER_HOST settings
  • Loading branch information
reubenmiller authored Oct 24, 2024
2 parents 0909caa + fb8bee7 commit 1528862
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/container
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ fi

if [ -n "$FOUND_FILE" ]; then
log "Loading setting file: $SETTINGS_FILE"
# Note: automatically export sourced variables to the environment
# as cli commands need to react to variables such as: DOCKER_HOST
set -a
# shellcheck disable=SC1091,SC1090
. "$SETTINGS_FILE"
set +a
fi

# Detect which container cli is available
Expand Down
4 changes: 4 additions & 0 deletions src/container-group
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,12 @@ fi

if [ -n "$FOUND_FILE" ]; then
log "Loading setting file: $SETTINGS_FILE"
# Note: automatically export sourced variables to the environment
# as cli commands need to react to variables such as: DOCKER_HOST
set -a
# shellcheck disable=SC1091,SC1090
. "$SETTINGS_FILE"
set +a
fi

# Detect which container cli is available
Expand Down
2 changes: 2 additions & 0 deletions src/monitor/tedge-container-monitor
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ load_settings() {

if [ -n "$FOUND_FILE" ]; then
debug "Reloading setting file: $SETTINGS_FILE"
set -a
# shellcheck disable=SC1091,SC1090
. "$SETTINGS_FILE"
set +a

# Convert log level before using any of the log helpers!
LOG_LEVEL=$(convert_loglevel "$LOG_LEVEL")
Expand Down

0 comments on commit 1528862

Please sign in to comment.