Skip to content

Commit fc8a006

Browse files
committed
chore: Remove iptable/iptables_nat kernel modules check and bump dockur/windows version to 5.07 (addresses & fixes #210)
1 parent a25f88e commit fc8a006

4 files changed

Lines changed: 4 additions & 33 deletions

File tree

src/renderer/lib/install.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const DefaultCompose: ComposeConfig = {
2121
},
2222
"services": {
2323
"windows": {
24-
"image": "ghcr.io/dockur/windows:5.03",
24+
"image": "ghcr.io/dockur/windows:5.07",
2525
"container_name": "WinBoat",
2626
"environment": {
2727
"VERSION": "11",

src/renderer/lib/specs.ts

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,24 @@ const execAsync = promisify(exec);
77

88
export function satisfiesPrequisites(specs: Specs) {
99
return specs.dockerInstalled &&
10-
specs.dockerComposeInstalled &&
10+
specs.dockerComposeInstalled &&
1111
specs.dockerIsRunning &&
1212
specs.dockerIsInUserGroups &&
1313
specs.freeRDP3Installed &&
14-
specs.ipTablesLoaded &&
15-
specs.iptableNatLoaded &&
1614
specs.kvmEnabled &&
1715
specs.ramGB >= 4 &&
1816
specs.cpuCores >= 2
1917
}
2018

21-
export const defaultSpecs: Specs = {
19+
export const defaultSpecs: Specs = {
2220
cpuCores: 0,
2321
ramGB: 0,
2422
kvmEnabled: false,
2523
dockerInstalled: false,
2624
dockerComposeInstalled: false,
2725
dockerIsRunning: false,
2826
dockerIsInUserGroups: false,
29-
freeRDP3Installed: false,
30-
ipTablesLoaded: false,
31-
iptableNatLoaded: false
27+
freeRDP3Installed: false
3228
}
3329

3430
export async function getSpecs() {
@@ -113,22 +109,6 @@ export async function getSpecs() {
113109
console.error('Error checking FreeRDP 3.x.x installation (most likely not installed):', e);
114110
}
115111

116-
// iptables kernel module check
117-
try {
118-
const { stdout: ipTablesOutput } = await execAsync('lsmod | grep ip_tables');
119-
specs.ipTablesLoaded = !!ipTablesOutput.trim();
120-
} catch (e) {
121-
console.error('Error checking ip_tables module:', e);
122-
}
123-
124-
// iptables_nat kernel module check
125-
try {
126-
const { stdout: iptableNatOutput } = await execAsync('lsmod | grep iptable_nat');
127-
specs.iptableNatLoaded = !!iptableNatOutput.trim();
128-
} catch (e) {
129-
console.error('Error checking iptable_nat module:', e);
130-
}
131-
132112
console.log('Specs:', specs);
133113
return specs;
134114
}

src/renderer/views/SetupUI.vue

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@
112112
FreeRDP 3.x.x installed
113113
<a href="https://github.com/FreeRDP/FreeRDP/wiki/PreBuilds" @click="openAnchorLink" target="_blank" class="text-violet-400 hover:underline ml-1">How?</a>
114114
</li>
115-
<li class="flex items-center gap-2">
116-
<span v-if="specs.ipTablesLoaded && specs.iptableNatLoaded" class="text-green-500">✔</span>
117-
<span v-else class="text-red-500">✘</span>
118-
<span class="font-mono bg-neutral-700 rounded-md px-0.5">iptables</span> and
119-
<span class="font-mono bg-neutral-700 rounded-md px-0.5">iptable_nat</span> modules loaded
120-
<a href="https://rentry.org/rmfq2e5e" @click="openAnchorLink" target="_blank" class="text-violet-400 hover:underline ml-1">How?</a>
121-
</li>
122115
</ul>
123116
<div class="flex flex-row gap-4 mt-6">
124117
<x-button class="px-6" @click="currentStepIdx--">Back</x-button>

src/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ export type Specs = {
99
dockerIsRunning: boolean,
1010
dockerIsInUserGroups: boolean;
1111
freeRDP3Installed: boolean;
12-
ipTablesLoaded: boolean;
13-
iptableNatLoaded: boolean;
1412
}
1513

1614
export type InstallConfiguration = {

0 commit comments

Comments
 (0)