removed version property from docker-compose

11 months ago · 331266499c
24 changed files with 1 additions and 60 deletions
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
+++ b/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.
 Modify the `docker-compose.yml` file for ThingsBoard Edge to update the volume settings.

-First, please update docker compose file version. Find next snippet:
-```text
-version: '3.0'
-...
-```
-
-And replace it with:
-```text
-version: '3.8'
-...
-```
-
-Then update volume mounts. Locate the following snippet:
+Update volume mounts. Locate the following snippet:
 ```text
    volumes:
      - ~/.mytb-edge-data:/data
--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  cassandra:
    volumes:
--- a/docker/docker-compose.confluent.yml
+++ b/docker/docker-compose.confluent.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  tb-js-executor:
    env_file:
--- a/docker/docker-compose.edqs.volumes.yml
+++ b/docker/docker-compose.edqs.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  tb-edqs1:
    volumes:
--- a/docker/docker-compose.edqs.yml
+++ b/docker/docker-compose.edqs.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  tb-core1:
    env_file:
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  postgres:
    restart: always
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  kafka:
    restart: always
--- a/docker/docker-compose.postgres.volumes.yml
+++ b/docker/docker-compose.postgres.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  postgres:
    volumes:
--- a/docker/docker-compose.postgres.yml
+++ b/docker/docker-compose.postgres.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  postgres:
    restart: always
--- a/docker/docker-compose.prometheus-grafana.yml
+++ b/docker/docker-compose.prometheus-grafana.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 volumes:
    prometheus_data: {}
    grafana_data: {}
--- a/docker/docker-compose.valkey-cluster.volumes.yml
+++ b/docker/docker-compose.valkey-cluster.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  # Valkey cluster
  valkey-node-0:
--- a/docker/docker-compose.valkey-cluster.yml
+++ b/docker/docker-compose.valkey-cluster.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
 # Valkey cluster
 # The latest version of Valkey compatible with ThingsBoard is 8.0
--- a/docker/docker-compose.valkey-sentinel.volumes.yml
+++ b/docker/docker-compose.valkey-sentinel.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  # Valkey sentinel
  valkey-primary:
--- a/docker/docker-compose.valkey-sentinel.yml
+++ b/docker/docker-compose.valkey-sentinel.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  # Valkey sentinel
  # The latest version of Valkey compatible with ThingsBoard is 8.0
--- a/docker/docker-compose.valkey.volumes.yml
+++ b/docker/docker-compose.valkey.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  valkey:
    volumes:
--- a/docker/docker-compose.valkey.yml
+++ b/docker/docker-compose.valkey.yml
@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-version: '3.0'
-
 services:
 # Valkey standalone
 # The latest version of Valkey compatible with ThingsBoard is 8.0
--- a/docker/docker-compose.volumes.yml
+++ b/docker/docker-compose.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  tb-core1:
    volumes:
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -14,9 +14,6 @@
 # limitations under the License.
 #

-
-version: '3.0'
-
 services:
  zookeeper:
    restart: always
--- a/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.hybrid-test-extras.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  cassandra:
    environment:
--- a/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.mosquitto.yml
@ -14,7 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
 services:
  broker:
    image: eclipse-mosquitto
--- a/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.postgres-test-extras.yml
@ -14,6 +14,4 @@
 # limitations under the License.
 #

-version: '3.0'
-
 # Placeholder
--- a/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.rabbitmq-server.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  rabbitmq:
    restart: always
--- a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.volumes.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
  valkey:
    volumes:
--- a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
@ -14,8 +14,6 @@
 # limitations under the License.
 #

-version: '3.0'
-
 services:
 # Valkey standalone
 # The latest version of Valkey compatible with ThingsBoard is 8.0