Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/app_api-adminSettings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/app_api-adminSettings.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/DaemonConfig/DaemonConfig.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<TestTube :size="20" />
</template>
</NcActionButton>
<NcActionButton v-if="daemon.accepts_deploy_id === 'docker-install'" :closeAfterClick="true" @click="_showOverrideDockerRegistriesModal()">
<NcActionButton v-if="['docker-install', 'kubernetes-install'].includes(daemon.accepts_deploy_id)" :closeAfterClick="true" @click="_showOverrideDockerRegistriesModal()">
{{ t('app_api', 'Docker registries') }}
<template #icon>
<Docker :size="20" />
Expand Down
5 changes: 3 additions & 2 deletions src/components/DaemonConfig/DockerRegistriesModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
:name="`${registry.from} -> ${registry.to}`"
:forceDisplayActions="true">
<template v-if="registry.to === 'local'" #details>
<span style="color: var(--color-warning);">{{ t('app_api', 'Image pull will be skipped') }}</span>
<span style="color: var(--color-warning-text);">{{ t('app_api', 'Image pull will be skipped') }}</span>
</template>
<template #actions>
<NcActionButton
Expand Down Expand Up @@ -194,7 +194,8 @@ export default {
},

registries() {
return this.daemon.deploy_config?.registries || []
// A list that lost an entry may come back from the server as an object keyed by index
return Object.values(this.daemon.deploy_config?.registries || [])
},

registryMappingFromValid() {
Expand Down
Loading