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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## unreleased
- DockerComposeファイルで環境変数がnullの場合に表示がおかしくなる不具合を修正
- スライダー周りの調整

## v0.0.5
- 他リポジトリとのバージョン整合のためバージョンを更新しました
- このバージョンではコードの変更はありません
Expand Down
13 changes: 10 additions & 3 deletions src/components/Apps/ComposeConfig.vue
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,9 @@ export default {
: Object.entries(composeServicesItemInput.environment)
composeServicesItem.environment = envArray.map((item) => {
const ii = typeof item === 'object' ? Array.from(item) : item.split('=')
const rawHostValue = ii[1] ?? ''
return {
host: ii[1].replace(/"/g, ''),
host: rawHostValue.replace(/"/g, ''),
container: ii[0],
}
})
Expand Down Expand Up @@ -896,9 +897,15 @@ export default {
</b-field>

<b-field :label="$t('Memory Limit')" class="mb-5">
<VueSlider :max="totalMemory" :min="memory_min" class="mx-2" :marks="true" :data="markData" :value="service.deploy.resources.limits.memory | duplexDisplay" @change="(v) => (service.deploy.resources.limits.memory = v)" />
</b-field>
<VueSlider
v-model="service.deploy.resources.limits.memory"
:max="totalMemory"
:min="memory_min"
:marks="true"
:data="markData"
/>

</b-field>
<b-field :label="$t('CPU Shares')">
<b-select v-model="service.cpu_shares" :placeholder="$t('Select')" expanded>
<option :value="10">
Expand Down
Loading