Skip to content
Snippets Groups Projects
Commit 6c75019a authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '6-fix-execute-hook-scripts-with-shebang-shell' into 'master'

Resolve "fix: execute hook scripts with shebang shell"

Closes #6

See merge request to-be-continuous/openshift!11
parents e1aa63c3 37bb6307
No related branches found
No related tags found
No related merge requests found
...@@ -254,7 +254,8 @@ stages: ...@@ -254,7 +254,8 @@ stages:
if [[ -f "$prescript" ]] if [[ -f "$prescript" ]]
then then
log_info "--- \\e[32mpre-apply hook\\e[0m (\\e[33;1m${prescript}\\e[0m) found: execute" log_info "--- \\e[32mpre-apply hook\\e[0m (\\e[33;1m${prescript}\\e[0m) found: execute"
bash "$prescript" chmod +x "$prescript"
"$prescript"
else else
log_info "--- \\e[32mpre-apply hook\\e[0m (\\e[33;1m${prescript}\\e[0m) not found: skip" log_info "--- \\e[32mpre-apply hook\\e[0m (\\e[33;1m${prescript}\\e[0m) not found: skip"
fi fi
...@@ -314,7 +315,8 @@ stages: ...@@ -314,7 +315,8 @@ stages:
if [[ -f "$readycheck" ]] if [[ -f "$readycheck" ]]
then then
log_info "--- \\e[32mreadiness-check hook\\e[0m (\\e[33;1m${readycheck}\\e[0m) found: execute" log_info "--- \\e[32mreadiness-check hook\\e[0m (\\e[33;1m${readycheck}\\e[0m) found: execute"
bash "$readycheck" chmod +x "$readycheck"
"$readycheck"
else else
log_info "--- \\e[32mreadiness-check hook\\e[0m (\\e[33;1m${readycheck}\\e[0m) not found: assume app is ready" log_info "--- \\e[32mreadiness-check hook\\e[0m (\\e[33;1m${readycheck}\\e[0m) not found: assume app is ready"
fi fi
...@@ -326,7 +328,8 @@ stages: ...@@ -326,7 +328,8 @@ stages:
if [[ -f "$postscript" ]] if [[ -f "$postscript" ]]
then then
log_info "--- \\e[32mpost-apply hook\\e[0m (\\e[33;1m${postscript}\\e[0m) found: execute" log_info "--- \\e[32mpost-apply hook\\e[0m (\\e[33;1m${postscript}\\e[0m) found: execute"
bash "$postscript" chmod +x "$postscript"
"$postscript"
else else
log_info "--- \\e[32mpost-apply hook\\e[0m (\\e[33;1m${postscript}\\e[0m) not found: skip" log_info "--- \\e[32mpost-apply hook\\e[0m (\\e[33;1m${postscript}\\e[0m) not found: skip"
fi fi
...@@ -360,7 +363,8 @@ stages: ...@@ -360,7 +363,8 @@ stages:
if [[ -f "$deployscript" ]] if [[ -f "$deployscript" ]]
then then
log_info "--- deploy script (\\e[33;1m${deployscript}\\e[0m) found: execute" log_info "--- deploy script (\\e[33;1m${deployscript}\\e[0m) found: execute"
bash "$deployscript" chmod +x "$deployscript"
"$deployscript"
else else
log_info "--- no deploy script found: run template-based deployment" log_info "--- no deploy script found: run template-based deployment"
...@@ -466,7 +470,8 @@ stages: ...@@ -466,7 +470,8 @@ stages:
if [[ -f "$cleanupscript" ]] if [[ -f "$cleanupscript" ]]
then then
log_info "--- cleanup script (\\e[33;1m${cleanupscript}\\e[0m) found: execute" log_info "--- cleanup script (\\e[33;1m${cleanupscript}\\e[0m) found: execute"
bash "$cleanupscript" chmod +x "$cleanupscript"
"$cleanupscript"
else else
log_info "--- no cleanup script found: proceed with template-based delete" log_info "--- no cleanup script found: proceed with template-based delete"
...@@ -475,7 +480,8 @@ stages: ...@@ -475,7 +480,8 @@ stages:
if [[ -f "$prescript" ]] if [[ -f "$prescript" ]]
then then
log_info "--- \\e[32mpre-cleanup hook\\e[0m (\\e[33;1m${prescript}\\e[0m) found: execute" log_info "--- \\e[32mpre-cleanup hook\\e[0m (\\e[33;1m${prescript}\\e[0m) found: execute"
bash "$prescript" chmod +x "$prescript"
"$prescript"
else else
log_info "--- \\e[32mpre-cleanup hook\\e[0m (\\e[33;1m${prescript}\\e[0m) not found: skip" log_info "--- \\e[32mpre-cleanup hook\\e[0m (\\e[33;1m${prescript}\\e[0m) not found: skip"
fi fi
...@@ -490,7 +496,8 @@ stages: ...@@ -490,7 +496,8 @@ stages:
if [[ -f "$postscript" ]] if [[ -f "$postscript" ]]
then then
log_info "--- \\e[32mpost-cleanup hook\\e[0m (\\e[33;1m${postscript}\\e[0m) found: execute" log_info "--- \\e[32mpost-cleanup hook\\e[0m (\\e[33;1m${postscript}\\e[0m) found: execute"
bash "$postscript" chmod +x "$postscript"
"$postscript"
else else
log_info "--- \\e[32mpost-cleanup hook\\e[0m (\\e[33;1m${postscript}\\e[0m) not found: skip" log_info "--- \\e[32mpost-cleanup hook\\e[0m (\\e[33;1m${postscript}\\e[0m) not found: skip"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment