Browse Source

Merge pull request #13722 from Yatharth0045/removed-version-from-compose

removed version property from docker-compose
pull/13737/head
Viacheslav Klimov 1 year ago
committed by GitHub
parent
commit
5655e89f77
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
  2. 2
      docker/docker-compose.cassandra.volumes.yml
  3. 2
      docker/docker-compose.confluent.yml
  4. 2
      docker/docker-compose.edqs.volumes.yml
  5. 2
      docker/docker-compose.edqs.yml
  6. 2
      docker/docker-compose.hybrid.yml
  7. 2
      docker/docker-compose.kafka.yml
  8. 2
      docker/docker-compose.postgres.volumes.yml
  9. 2
      docker/docker-compose.postgres.yml
  10. 2
      docker/docker-compose.prometheus-grafana.yml
  11. 2
      docker/docker-compose.valkey-cluster.volumes.yml
  12. 2
      docker/docker-compose.valkey-cluster.yml
  13. 2
      docker/docker-compose.valkey-sentinel.volumes.yml
  14. 2
      docker/docker-compose.valkey-sentinel.yml
  15. 2
      docker/docker-compose.valkey.volumes.yml
  16. 3
      docker/docker-compose.valkey.yml
  17. 2
      docker/docker-compose.volumes.yml
  18. 3
      docker/docker-compose.yml
  19. 2
      msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
  20. 1
      msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
  21. 2
      msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
  22. 2
      msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
  23. 2
      msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
  24. 2
      msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml

14
application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md

@ -32,19 +32,7 @@ docker run --rm -v tb-edge-postgres-data:/volume -v ~/.mytb-edge-data/db:/backup
After completing the data migration to the newly created Docker volumes, you'll need to update the volume mounts in your Docker Compose configuration. After completing the data migration to the newly created Docker volumes, you'll need to update the volume mounts in your Docker Compose configuration.
Modify the `docker-compose.yml` file for ThingsBoard Edge to update the volume settings. Modify the `docker-compose.yml` file for ThingsBoard Edge to update the volume settings.
First, please update docker compose file version. Find next snippet: Update volume mounts. Locate the following snippet:
```text
version: '3.0'
...
```
And replace it with:
```text
version: '3.8'
...
```
Then update volume mounts. Locate the following snippet:
```text ```text
volumes: volumes:
- ~/.mytb-edge-data:/data - ~/.mytb-edge-data:/data

2
docker/docker-compose.cassandra.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
cassandra: cassandra:
volumes: volumes:

2
docker/docker-compose.confluent.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
tb-js-executor: tb-js-executor:
env_file: env_file:

2
docker/docker-compose.edqs.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
tb-edqs1: tb-edqs1:
volumes: volumes:

2
docker/docker-compose.edqs.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
tb-core1: tb-core1:
env_file: env_file:

2
docker/docker-compose.hybrid.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
postgres: postgres:
restart: always restart: always

2
docker/docker-compose.kafka.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
kafka: kafka:
restart: always restart: always

2
docker/docker-compose.postgres.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
postgres: postgres:
volumes: volumes:

2
docker/docker-compose.postgres.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
postgres: postgres:
restart: always restart: always

2
docker/docker-compose.prometheus-grafana.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
volumes: volumes:
prometheus_data: {} prometheus_data: {}
grafana_data: {} grafana_data: {}

2
docker/docker-compose.valkey-cluster.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey cluster # Valkey cluster
valkey-node-0: valkey-node-0:

2
docker/docker-compose.valkey-cluster.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey cluster # Valkey cluster
# The latest version of Valkey compatible with ThingsBoard is 8.0 # The latest version of Valkey compatible with ThingsBoard is 8.0

2
docker/docker-compose.valkey-sentinel.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey sentinel # Valkey sentinel
valkey-primary: valkey-primary:

2
docker/docker-compose.valkey-sentinel.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey sentinel # Valkey sentinel
# The latest version of Valkey compatible with ThingsBoard is 8.0 # The latest version of Valkey compatible with ThingsBoard is 8.0

2
docker/docker-compose.valkey.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
valkey: valkey:
volumes: volumes:

3
docker/docker-compose.valkey.yml

@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey standalone # Valkey standalone
# The latest version of Valkey compatible with ThingsBoard is 8.0 # The latest version of Valkey compatible with ThingsBoard is 8.0

2
docker/docker-compose.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
tb-core1: tb-core1:
volumes: volumes:

3
docker/docker-compose.yml

@ -14,9 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
zookeeper: zookeeper:
restart: always restart: always

2
msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
cassandra: cassandra:
environment: environment:

1
msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
broker: broker:
image: eclipse-mosquitto image: eclipse-mosquitto

2
msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml

@ -14,6 +14,4 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
# Placeholder # Placeholder

2
msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
rabbitmq: rabbitmq:
restart: always restart: always

2
msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
valkey: valkey:
volumes: volumes:

2
msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
# #
version: '3.0'
services: services:
# Valkey standalone # Valkey standalone
# The latest version of Valkey compatible with ThingsBoard is 8.0 # The latest version of Valkey compatible with ThingsBoard is 8.0

Loading…
Cancel
Save