Skip to content

Commit 9b631e4

Browse files
committed
chore: Update docker images and add new services in quick start guide; remove image placeholder in system upgrade documentation
1 parent f2c8cfd commit 9b631e4

3 files changed

Lines changed: 59 additions & 9 deletions

File tree

docs/installation/system_upgrade_1panel.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ docker cp thingspanel-docker-backend-1:/go/src/app/files "$BACKUP_DIR/files"
5656
#### 3.1.2 Backup docker-compose.yml
5757

5858
1. Go to the 1Panel dashboard -> **Containers** -> **Compose** -> Edit **thingspanel-docker** and copy the current configuration.
59-
![alt text](image.png)
6059

6160
2. Save a backup of this file from the terminal:
6261
```bash

i18n/zh-Hans/docusaurus-plugin-content-docs/current/installation/system_upgrade_1panel.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ docker cp thingspanel-docker-backend-1:/go/src/app/files "$BACKUP_DIR/files"
5656
#### 3.1.2 备份 docker-compose.yml
5757

5858
1. 进入 1Panel 面板 -> **容器** -> **编排** -> 编辑 **thingspanel-docker** 并复制当前配置。
59-
![alt text](image.png)
6059

6160
2. 在终端内保存该文件备份:
6261
```bash

i18n/zh-Hans/docusaurus-plugin-content-docs/current/quick_start/quick_start.md

Lines changed: 59 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ version: "3.9"
5050

5151
services:
5252
frontend:
53-
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-vue:v1.1.11
53+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-vue:v1.1.13.5
5454
ports:
5555
- "8080:8080"
5656
environment:
@@ -89,7 +89,7 @@ services:
8989
- thingspanel_network
9090

9191
gmqtt:
92-
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-gmqtt:v1.1.5
92+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-gmqtt:v1.1.6
9393
volumes:
9494
- gmqtt:/gmqttd
9595
ports:
@@ -132,7 +132,7 @@ services:
132132
- thingspanel_network
133133

134134
backend:
135-
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-go:v1.1.11
135+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-go:v1.1.13.5
136136
ports:
137137
- "9999:9999"
138138
environment:
@@ -164,22 +164,73 @@ services:
164164
- thingspanel_network
165165

166166
modbus_service:
167-
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/modbus-protocol-plugin:v1.0.5
167+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/modbus-protocol-plugin:v1.0.6.1
168168
ports:
169169
- "502:502"
170170
- "503:503"
171171
environment:
172172
- "MODBUS_THINGSPANEL_ADDRESS=http://backend:9999"
173173
- "MODBUS_MQTT_BROKER=gmqtt:1883"
174174
- "MODBUS_MQTT_QOS=0"
175+
- "MODBUS_EXCEPTION_REPORT_ENABLED=true"
175176
networks:
176177
thingspanel_network:
177-
ipv4_address: 172.20.0.10 # 指定固定IP地址
178+
ipv4_address: 172.20.0.10 # Specify fixed IP address
178179
depends_on:
179180
- backend
180181
- gmqtt
181182
restart: unless-stopped
182183

184+
http_adapter:
185+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingspanel-adapter-http:v1.0.0
186+
ports:
187+
- "19090:19090"
188+
- "19091:19091"
189+
environment:
190+
- "TZ=Asia/Shanghai"
191+
- "P_SERVER_PORT=19090"
192+
- "P_SERVER_HTTP_PORT=19091"
193+
- "P_PLATFORM_URL=http://backend:9999"
194+
- "P_PLATFORM_MQTT_BROKER=tcp://gmqtt:1883"
195+
networks:
196+
thingspanel_network:
197+
ipv4_address: 172.20.0.11 # Specify fixed IP address
198+
depends_on:
199+
- backend
200+
- gmqtt
201+
thingsvis-server:
202+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingsvis-server:v1.0.3.1
203+
container_name: thingsvis-server
204+
restart: unless-stopped
205+
ports:
206+
- "8000:8000"
207+
environment:
208+
- NODE_ENV=production
209+
- HOSTNAME=0.0.0.0
210+
- AUTH_TRUST_HOST=true
211+
- DATABASE_URL=postgresql://postgres:postgresThingsPanel@postgres:5432/ThingsPanel?schema=thingsvis
212+
- AUTH_SECRET=your-super-secret-auth-key
213+
depends_on:
214+
postgres:
215+
condition: service_healthy
216+
networks:
217+
- thingspanel_network
218+
219+
thingsvis-studio:
220+
image: registry.cn-hangzhou.aliyuncs.com/thingspanel/thingsvis-studio:v1.0.3.1
221+
container_name: thingsvis-studio
222+
restart: unless-stopped
223+
ports:
224+
- "3000:3000"
225+
environment:
226+
- STUDIO_PORT=3000
227+
- SERVER_HOST=thingsvis-server
228+
- SERVER_PORT=8000
229+
depends_on:
230+
- thingsvis-server
231+
networks:
232+
- thingspanel_network
233+
183234
volumes:
184235
go_files:
185236
go_configs:
@@ -194,8 +245,9 @@ networks:
194245
ipam:
195246
driver: default
196247
config:
197-
- subnet: 172.20.0.0/16 # 定义网络的子网范围
198-
gateway: 172.20.0.1 # 定义网关地址
248+
- subnet: 172.20.0.0/16 # Define subnet range
249+
gateway: 172.20.0.1 # Define gateway address
250+
199251
```
200252

201253
:::info

0 commit comments

Comments
 (0)