Skip to content
Snippets Groups Projects
Commit 84c48cba authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !16
parents 2266bffc 608debbe
No related branches found
Tags v3.7.29
1 merge request!16Merging develop into main
Pipeline #523100 passed
...@@ -552,9 +552,9 @@ class Handler extends BaseHandler { ...@@ -552,9 +552,9 @@ class Handler extends BaseHandler {
$disabled = !empty($task['disabled']); $disabled = !empty($task['disabled']);
$command = $task['command']; $command = $task['command'];
$ping_url = FALSE; $ping_url = FALSE;
$task['name'] = $name;
if (isset($hj_manager)) { if (isset($hj_manager)) {
unset($task['disabled'], $task['command']); unset($task['disabled'], $task['command']);
$task['name'] = $name;
$task['channels'] = $hj_api_channels; $task['channels'] = $hj_api_channels;
$task['tags'] = implode(' ', ['d4d', $hj_project, $hj_branch]); $task['tags'] = implode(' ', ['d4d', $hj_project, $hj_branch]);
$task['tz'] = $hj_timezone; $task['tz'] = $hj_timezone;
......
...@@ -5,6 +5,6 @@ tty = true ...@@ -5,6 +5,6 @@ tty = true
user = {{ line.user }} user = {{ line.user }}
schedule = {{ line.schedule }} schedule = {{ line.schedule }}
container = {{ projectname }}-php-1 container = {{ projectname }}-php-1
command = sh -c \"{{ line.command }}{% if line.ping_url %} && curl -fsS --retry 5 --retry-delay 9 -o /dev/null {{ line.ping_url }}{% endif %}\" command = sh -c \"{{ line.command|raw }}{% if line.ping_url %} && curl -fsS --retry 5 --retry-delay 9 -o /dev/null {{ line.ping_url }}{% endif %}\"
{% endfor %} {% endfor %}
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