Skip to content

Commit 0340581

Browse files
committed
Merge branch 'staging/4.3' into release/4.3
2 parents 997a856 + 10f9209 commit 0340581

File tree

68 files changed

+2081
-721
lines changed

Some content is hidden

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

68 files changed

+2081
-721
lines changed

_data/host-constant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
hostLabel: localhost
1111
hostName: localhost
1212
mqttHostName: localhost
13-
coapHostName: coap.thingsboard.cloud
13+
coapHostName: localhost
1414
httpsUrl: https://thingsboard.cloud
1515
lwm2mHostName: lwm2m.thingsboard.cloud
1616
apiHostName: YOUR_SERVER_HOSTNAME

_includes/docs/pe/user-guide/install/docker-upgrade-steps.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44

55
2. Execute the following commands:
66

7-
87
{% if include.skipUpgrade %}
9-
```bash
10-
docker pull thingsboard/tb-pe-node:{{ current_version }}
11-
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
12-
docker compose stop thingsboard-pe
13-
docker compose up -d
14-
```
15-
{: .copy-code}
8+
9+
```bash
10+
docker pull thingsboard/tb-pe-node:{{ current_version }}
11+
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
12+
docker compose stop thingsboard-pe
13+
docker compose up -d
14+
```
15+
{: .copy-code}
16+
1617
{% else %}
17-
```bash
18-
docker pull thingsboard/tb-pe-node:{{ current_version }}
19-
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
20-
docker compose stop thingsboard-pe
21-
docker compose run --rm -e UPGRADE_TB=true thingsboard-pe
22-
docker compose up -d
23-
```
24-
{: .copy-code}
18+
19+
```bash
20+
docker pull thingsboard/tb-pe-node:{{ current_version }}
21+
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
22+
docker compose stop thingsboard-pe
23+
docker compose run --rm -e UPGRADE_TB=true thingsboard-pe
24+
docker compose up -d
25+
```
26+
{: .copy-code}
27+
2528
{% endif %}

_includes/docs/pe/user-guide/install/new-docker-upgrade-steps.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ If you are upgrading from version {{ previous_version }}, you must run the scrip
1616

1717
2. Execute the following commands:
1818

19-
```bash
20-
docker pull thingsboard/tb-pe-node:{{ current_version }}
21-
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
22-
docker compose stop thingsboard-pe
23-
```
24-
{: .copy-code}
19+
```bash
20+
docker pull thingsboard/tb-pe-node:{{ current_version }}
21+
docker pull thingsboard/tb-pe-web-report:{{ current_version }}
22+
docker compose stop thingsboard-pe
23+
```
24+
{: .copy-code}
2525

26-
{% include templates/warn-banner.md content=update_note %}
26+
{% include templates/warn-banner.md content=update_note %}
2727

28-
```bash
29-
docker compose run --rm -e UPGRADE_TB=true thingsboard-pe
30-
```
31-
{: .copy-code}
28+
```bash
29+
docker compose run --rm -e UPGRADE_TB=true thingsboard-pe
30+
```
31+
{: .copy-code}
3232

33-
```bash
34-
docker compose up -d
35-
```
36-
{: .copy-code}
33+
```bash
34+
docker compose up -d
35+
```
36+
{: .copy-code}

_includes/docs/reference/coap-api.md

Lines changed: 109 additions & 87 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)