Skip to content

Commit 2bf99c2

Browse files
authored
Merge pull request #2819 from semaphoreui/fix_know_file
Fix know file
2 parents 75ffe9c + 101e724 commit 2bf99c2

File tree

6 files changed

+42
-16
lines changed

6 files changed

+42
-16
lines changed

db_lib/AnsiblePlaybook.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func (p AnsiblePlaybook) makeCmd(command string, args []string, environmentVars
2525
cmd.Env = append(cmd.Env, "PYTHONUNBUFFERED=1")
2626
cmd.Env = append(cmd.Env, "ANSIBLE_FORCE_COLOR=True")
2727
cmd.Env = append(cmd.Env, "ANSIBLE_HOST_KEY_CHECKING=False")
28+
cmd.Env = append(cmd.Env, "ANSIBLE_SSH_ARGS=-o UserKnownHostsFile=/dev/null")
2829
cmd.Env = append(cmd.Env, getEnvironmentVars()...)
2930
cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", util.Config.TmpPath))
3031
cmd.Env = append(cmd.Env, fmt.Sprintf("PWD=%s", cmd.Dir))

deployment/docker/server/ansible.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[defaults]
2-
host_key_checking = False
32
bin_ansible_callbacks = True
43
stdout_callback = yaml

web/src/components/EnvironmentForm.vue

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
class="mb-2"
2222
></v-text-field>
2323

24-
<v-tabs grow v-model="tab" class="mb-7">
24+
<v-tabs grow v-model="tab">
2525
<v-tab key="variables">Variables</v-tab>
2626
<v-tab key="secrets">Secrets</v-tab>
2727
</v-tabs>
2828

29+
<v-divider style="margin-top: -1px;" class="mb-7" />
30+
2931
<v-tabs-items v-model="tab">
3032
<v-tab-item key="variables">
3133

@@ -82,7 +84,7 @@
8284
v-if="extraVars != null"
8385
:items="extraVars"
8486
:items-per-page="-1"
85-
class="elevation-1"
87+
class="elevation-1 EnvironmentForm__fields"
8688
hide-default-footer
8789
:no-data-text="$t('noValues')"
8890
style="background: #8585850f"
@@ -140,7 +142,7 @@
140142
<v-data-table
141143
:items="env"
142144
:items-per-page="-1"
143-
class="elevation-1"
145+
class="elevation-1 EnvironmentForm__fields"
144146
hide-default-footer
145147
:no-data-text="$t('noValues')"
146148
style="background: #8585850f"
@@ -213,7 +215,7 @@
213215
<v-data-table
214216
:items="secrets.filter(s => !s.remove && s.type === 'var')"
215217
:items-per-page="-1"
216-
class="elevation-1"
218+
class="elevation-1 EnvironmentForm__fields"
217219
hide-default-footer
218220
:no-data-text="$t('noValues')"
219221
style="background: #8585850f"
@@ -272,7 +274,7 @@
272274
<v-data-table
273275
:items="secrets.filter(s => !s.remove && s.type === 'env')"
274276
:items-per-page="-1"
275-
class="elevation-1"
277+
class="elevation-1 EnvironmentForm__fields"
276278
hide-default-footer
277279
:no-data-text="$t('noValues')"
278280
style="background: #8585850f"
@@ -321,6 +323,30 @@
321323
</v-form>
322324
</template>
323325

326+
<style lang="scss">
327+
.vue-codemirror {
328+
border-radius: 6px !important;
329+
}
330+
.CodeMirror {
331+
border-radius: 5px !important;
332+
}
333+
.EnvironmentForm__fields {
334+
.v-data-table__wrapper {
335+
padding-left: 0 !important;
336+
padding-right: 0 !important;
337+
td {
338+
border-bottom: 0 !important;
339+
}
340+
td:last-child {
341+
padding-right: 15px !important;
342+
}
343+
td:first-child {
344+
padding-left: 5px !important;
345+
}
346+
}
347+
}
348+
</style>
349+
324350
<script>
325351
/* eslint-disable import/no-extraneous-dependencies,import/extensions */
326352

web/src/components/TaskParamsForm.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div v-if="app === 'ansible'">
33
<v-row no-gutters class="mt-6">
4-
<v-col cols="12" sm="6" v-if="templateParams.allow_debug">
4+
<v-col v-if="templateParams.allow_debug">
55
<v-checkbox
66
class="mt-0"
77
:input-value="params.debug"
@@ -12,7 +12,7 @@
1212
</template>
1313
</v-checkbox>
1414
</v-col>
15-
<v-col cols="12" sm="6">
15+
<v-col>
1616
<v-checkbox
1717
class="mt-0"
1818
:input-value="params.dry_run"
@@ -23,7 +23,7 @@
2323
</template>
2424
</v-checkbox>
2525
</v-col>
26-
<v-col cols="12" sm="6">
26+
<v-col>
2727
<v-checkbox
2828
class="mt-0"
2929
:input-value="params.diff"
@@ -38,7 +38,7 @@
3838
</div>
3939
<div v-else-if="app === 'terraform' || app === 'tofu'">
4040
<v-row no-gutters class="mt-6">
41-
<v-col cols="12" sm="6">
41+
<v-col>
4242
<v-checkbox
4343
class="mt-0"
4444
:input-value="params.plan"
@@ -50,7 +50,7 @@
5050
</v-checkbox>
5151
</v-col>
5252

53-
<v-col cols="12" sm="6">
53+
<v-col>
5454
<v-checkbox
5555
class="mt-0"
5656
:input-value="params.destroy"
@@ -62,7 +62,7 @@
6262
</v-checkbox>
6363
</v-col>
6464

65-
<v-col cols="12">
65+
<v-col>
6666
<v-checkbox
6767
class="mt-0"
6868
:input-value="params.auto_approve"
@@ -74,7 +74,7 @@
7474
</v-checkbox>
7575
</v-col>
7676

77-
<v-col cols="12" sm="6">
77+
<v-col>
7878
<v-checkbox
7979
class="mt-0"
8080
:input-value="params.upgrade"
@@ -86,7 +86,7 @@
8686
</v-checkbox>
8787
</v-col>
8888

89-
<v-col cols="12">
89+
<v-col>
9090
<v-checkbox
9191
class="mt-0"
9292
:input-value="params.reconfigure"

web/src/components/TemplateForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
<v-checkbox
311311
class="mt-0"
312312
:label="$t('allowInventoryInTask')"
313-
v-model="item.task_params.allow_override_inventory"
313+
v-model="(item.task_params || {}).allow_override_inventory"
314314
v-if="needField('allow_override_inventory')"
315315
/>
316316

web/src/views/project/Environment.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
v-model="editDialog"
55
:save-button-text="$t('save')"
66
:title="$t('editEnvironment')"
7-
:max-width="500"
7+
:max-width="700"
88
@save="loadItems"
99
:help-button="true"
1010
>

0 commit comments

Comments
 (0)