Skip to content

Commit 227b474

Browse files
committed
Fix SPDX issue
1 parent 58e261f commit 227b474

8 files changed

Lines changed: 15239 additions & 31 deletions

File tree

vmm/src/console_beta.html

Lines changed: 15229 additions & 0 deletions
Large diffs are not rendered by default.

vmm/ui/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules
22
dist
33
build
44
*.log
5+
/src/proto/

vmm/ui/build.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ async function build({ watch = false } = {}) {
238238
},
239239
]);
240240
await fs.writeFile(distFile, rehtml);
241-
await fs.writeFile(targetFile, rehtml);
241+
const spdxHeader = '<!-- SPDX-FileCopyrightText: © 2025 Phala Network <dstack@phala.network>\n SPDX-License-Identifier: Apache-2.0 -->\n';
242+
await fs.writeFile(targetFile, spdxHeader + rehtml);
242243
console.log('Rebuilt console');
243244
} catch (err) {
244245
console.error('Build failed:', err);

vmm/ui/scripts/build_proto.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
22

3+
# SPDX-FileCopyrightText: © 2024-2025 Phala Network <dstack@phala.network>
4+
# SPDX-License-Identifier: Apache-2.0
5+
36
set -euo pipefail
47

58
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"

vmm/ui/src/components/CreateVmDialog.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ const CreateVmDialogComponent = {
7676
<input id="diskSize" v-model.number="form.disk_size" type="number" placeholder="Storage size in GB" required>
7777
</div>
7878
79-
<div class="form-group">
80-
<label for="diskType">Storage Interface</label>
81-
<select id="diskType" v-model="form.disk_type">
82-
<option value="virtio-pci">Virtio PCI</option>
83-
<option value="nvme">NVMe</option>
84-
</select>
85-
</div>
86-
8779
<div class="form-group">
8880
<label for="storageFs">Storage Filesystem
8981
<span class="help-icon" title="ZFS: strong integrity guarantees. ext4: lower overhead for databases.">?</span>

vmm/ui/src/components/ForkVmDialog.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ const ForkVmDialogComponent = {
4242
<input id="forkDiskSize" v-model.number="dialog.disk_size" type="number" placeholder="Disk size in GB" required>
4343
</div>
4444
45-
<div class="form-group">
46-
<label for="forkDiskType">Disk Type</label>
47-
<select id="forkDiskType" v-model="dialog.disk_type">
48-
<option value="virtio-pci">Virtio PCI</option>
49-
<option value="nvme">NVMe</option>
50-
</select>
51-
</div>
52-
5345
<div class="dialog-footer">
5446
<button class="action-btn primary" @click="$emit('submit')">Derive</button>
5547
<button class="action-btn" @click="$emit('close')">Cancel</button>

vmm/ui/src/composables/useVmManager.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if (localStorage.getItem('dangerConfirm') === null) {
4545
}
4646

4747
type MemoryUnit = 'MB' | 'GB';
48-
type DiskType = 'virtio-pci' | 'nvme';
4948

5049
type JsonRpcCall = (method: string, params?: Record<string, unknown>) => Promise<Response>;
5150
type Ref<T> = { value: T };
@@ -89,7 +88,6 @@ type VmFormState = {
8988
swapValue: number;
9089
swapUnit: MemoryUnit;
9190
disk_size: number;
92-
disk_type: DiskType;
9391
selectedGpus: string[];
9492
attachAllGpus: boolean;
9593
ports: PortFormEntry[];
@@ -127,7 +125,6 @@ type UpdateDialogState = {
127125
swapValue: number;
128126
swapUnit: MemoryUnit;
129127
disk_size: number;
130-
disk_type: DiskType;
131128
image: string;
132129
ports: PortFormEntry[];
133130
attachAllGpus: boolean;
@@ -144,7 +141,6 @@ type CloneConfigDialogState = {
144141
vcpu: number;
145142
memory: number;
146143
disk_size: number;
147-
disk_type: DiskType;
148144
ports: PortFormEntry[];
149145
user_config: string;
150146
gpus?: VmmTypes.IGpuConfig;
@@ -171,7 +167,6 @@ function createVmFormState(preLaunchScript: string): VmFormState {
171167
swapValue: 0,
172168
swapUnit: 'GB',
173169
disk_size: 20,
174-
disk_type: 'virtio-pci',
175170
selectedGpus: [],
176171
attachAllGpus: false,
177172
ports: [],
@@ -211,7 +206,6 @@ function createUpdateDialogState(): UpdateDialogState {
211206
swapValue: 0,
212207
swapUnit: 'GB',
213208
disk_size: 0,
214-
disk_type: 'virtio-pci',
215209
image: '',
216210
ports: [],
217211
attachAllGpus: false,
@@ -230,7 +224,6 @@ function createCloneConfigDialogState(): CloneConfigDialogState {
230224
vcpu: 0,
231225
memory: 0,
232226
disk_size: 0,
233-
disk_type: 'virtio-pci',
234227
ports: [],
235228
user_config: '',
236229
gpus: undefined,
@@ -413,7 +406,6 @@ fi
413406
vcpu: number;
414407
memory: number;
415408
disk_size: number;
416-
disk_type: DiskType;
417409
ports: PortFormEntry[];
418410
encrypted_env?: Uint8Array;
419411
app_id?: string | null;
@@ -435,7 +427,6 @@ fi
435427
vcpu: Math.max(1, Number(source.vcpu) || 1),
436428
memory: Math.max(0, Number(source.memory) || 0),
437429
disk_size: Math.max(0, Number(source.disk_size) || 0),
438-
disk_type: source.disk_type || 'virtio-pci',
439430
ports: normalizedPorts,
440431
encrypted_env: source.encrypted_env,
441432
app_id: source.app_id || undefined,
@@ -836,7 +827,6 @@ fi
836827
vmForm.value.swapValue = 0;
837828
vmForm.value.swapUnit = 'GB';
838829
vmForm.value.swap_size = 0;
839-
vmForm.value.disk_type = 'virtio-pci';
840830
loadGpus();
841831
}
842832

@@ -866,7 +856,6 @@ fi
866856
swapValue: swapDisplay.memoryValue,
867857
swapUnit: swapDisplay.memoryUnit,
868858
disk_size: config.disk_size || 0,
869-
disk_type: (config.disk_type as DiskType) || 'virtio-pci',
870859
image: config.image || '',
871860
ports: clonePortMappings(config.ports || []),
872861
attachAllGpus: gpuSelection.attachAll,
@@ -957,7 +946,6 @@ fi
957946
vcpu: vmForm.value.vcpu,
958947
memory: vmForm.value.memory,
959948
disk_size: vmForm.value.disk_size,
960-
disk_type: vmForm.value.disk_type,
961949
ports: vmForm.value.ports,
962950
encrypted_env: encryptedEnv || undefined,
963951
app_id: vmForm.value.app_id || undefined,
@@ -1086,7 +1074,6 @@ fi
10861074
swapValue: autoMemoryDisplay(bytesToMB(theVm.appCompose?.swap_size || 0)).memoryValue,
10871075
swapUnit: autoMemoryDisplay(bytesToMB(theVm.appCompose?.swap_size || 0)).memoryUnit,
10881076
disk_size: config.disk_size || 0,
1089-
disk_type: (config.disk_type as DiskType) || 'virtio-pci',
10901077
selectedGpus: [],
10911078
attachAllGpus: false,
10921079
encryptedEnvs: [], // Clear environment variables
@@ -1126,7 +1113,6 @@ fi
11261113
vcpu: source.vcpu,
11271114
memory: source.memory,
11281115
disk_size: source.disk_size,
1129-
disk_type: source.disk_type,
11301116
ports: source.ports,
11311117
encrypted_env: source.encrypted_env,
11321118
app_id: source.app_id,

vmm/ui/src/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-FileCopyrightText: © 2024-2025 Phala Network <dstack@phala.network>
3+
SPDX-License-Identifier: Apache-2.0
4+
-->
15
<!DOCTYPE html>
26
<html lang="en">
37

0 commit comments

Comments
 (0)