Skip to content

Commit

Permalink
Fix checking directory for ignore running docker when scripts are mis…
Browse files Browse the repository at this point in the history
…sing.
  • Loading branch information
mosbth committed Oct 30, 2020
1 parent 4d16c10 commit 4eb53a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions REVISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ Revision history



v2.4.1 (2020-10-29)
----------------------------------

* Fix checking directory for ignore running docker when scripts are missing.



v2.4.0 (2020-10-29)
----------------------------------

Expand Down
4 changes: 2 additions & 2 deletions gui.bash
Original file line number Diff line number Diff line change
Expand Up @@ -1204,9 +1204,9 @@ makeDockerRunExtras()
header "Docker run scripts" | tee -a "$LOGFILE"

# Only if there are scripts to execute for kmom
local kmomScripts="$path/../$kmom"
local kmomScripts="$( dirname "$path" )/$kmom"
if [[ ! -d "$kmomScripts" || -z "$(ls -A $kmomScripts)" ]]; then
echo "No script to execute in docker." | tee -a "$LOGFILE"
echo "No scripts to execute in docker for '$kmom'." | tee -a "$LOGFILE"
else
# Run the scripts using run.bash through docker-compose
echo "docker-compose -f docker-compose.yaml run --service-ports server bash $script $kmom $acronym" | tee -a "$LOGFILE"
Expand Down

0 comments on commit 4eb53a1

Please sign in to comment.