Skip to content

Commit d91f948

Browse files
Merge branch 'master' into copilot/create-docker-build-browser-solution
2 parents e7e3913 + 6c041cb commit d91f948

58 files changed

Lines changed: 2184 additions & 667 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "MQTT Explorer Development",
33
"dockerComposeFile": "docker-compose.yml",
44
"service": "app",
5-
"workspaceFolder": "/workspace",
5+
"workspaceFolder": "/workspace/MQTT-Explorer",
66

77
"customizations": {
88
"vscode": {
@@ -15,7 +15,6 @@
1515
],
1616
"settings": {
1717
"editor.formatOnSave": true,
18-
"editor.defaultFormatter": "esbenp.prettier-vscode",
1918
"typescript.tsdk": "node_modules/typescript/lib",
2019
"editor.codeActionsOnSave": {
2120
"source.fixAll.eslint": "explicit"
@@ -24,7 +23,7 @@
2423
}
2524
},
2625

27-
"forwardPorts": [3000, 8080, 1883],
26+
"forwardPorts": [3000, 8080, 1883, 5900, 6080],
2827
"portsAttributes": {
2928
"3000": {
3029
"label": "MQTT Explorer Server",
@@ -37,10 +36,29 @@
3736
"1883": {
3837
"label": "MQTT Broker",
3938
"onAutoForward": "ignore"
39+
},
40+
"5900": {
41+
"label": "VNC Server",
42+
"onAutoForward": "ignore"
43+
},
44+
"6080": {
45+
"label": "noVNC Web Client",
46+
"onAutoForward": "notify"
4047
}
4148
},
4249

4350
"postCreateCommand": "yarn install",
4451

52+
"postStartCommand": "sudo apt-get update && sudo apt-get install -y mosquitto xvfb x11vnc ffmpeg tmux python3 python3-pip && sudo pip3 install --break-system-packages websockify",
53+
54+
"features": {
55+
"ghcr.io/devcontainers/features/common-utils:2": {
56+
"installZsh": true,
57+
"installOhMyZsh": true,
58+
"upgradePackages": true
59+
}
60+
},
61+
4562
"remoteUser": "node"
4663
}
64+

.devcontainer/docker-compose.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ version: '3.8'
22

33
services:
44
app:
5-
image: mcr.microsoft.com/devcontainers/javascript-node:20
5+
image: mcr.microsoft.com/devcontainers/javascript-node:24
66
volumes:
7-
- ../..:/workspace:cached
7+
- ..:/workspaces/MQTT-Explorer:cached
88
command: sleep infinity
99
network_mode: service:mosquitto
1010
environment:
@@ -14,8 +14,10 @@ services:
1414
mosquitto:
1515
image: eclipse-mosquitto:2
1616
ports:
17-
- "1883:1883"
18-
- "3000:3000"
19-
- "8080:8080"
17+
- '1883:1883'
18+
- '3000:3000'
19+
- '8080:8080'
20+
- '5900:5900'
21+
- '6080:6080'
2022
volumes:
2123
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf:ro

0 commit comments

Comments
 (0)