diff --git a/README.md b/README.md index 3beeac58..617ca537 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ DataLens requires Docker to be installed. Follow these instructions depending on - [Linux](https://docs.docker.com/engine/install/) - [Windows](https://docs.docker.com/desktop/install/windows-install/) +\* Note about docker compose + +- New docker compose plugin available as `docker-compose-v2` package on Ubuntu 20.04/22.04/24.04 from base APT repository + +- Minimal supported version of legacy docker-compose utility as separate package is `1.29.0`. It includes in base APT repository as `docker-compose` package only on Ubuntu 22.04 + ### Running containers Use the following command to start DataLens containers: @@ -49,10 +55,10 @@ Available since [release v1.11.0](https://github.com/datalens-tech/datalens/rele Use the following container parameters for launch: -| Parameter | Description | Values | -|---|---|---| -| `YANDEX_MAP_ENABLED` | Enable usage of Yandex Map visualization | `1` or `true` | -| `YANDEX_MAP_TOKEN` | Yandex Map [API key](https://yandex.ru/dev/jsapi-v2-1/doc/en/) | `` | +| Parameter | Description | Values | +| -------------------- | -------------------------------------------------------------- | ------------- | +| `YANDEX_MAP_ENABLED` | Enable usage of Yandex Map visualization | `1` or `true` | +| `YANDEX_MAP_TOKEN` | Yandex Map [API key](https://yandex.ru/dev/jsapi-v2-1/doc/en/) | `` | ```bash YANDEX_MAP_ENABLED=1 YANDEX_MAP_TOKEN=XXXXXXXXX docker compose up @@ -107,8 +113,8 @@ HC=1 docker compose -f docker-compose.zitadel.yml up After that you can login to DataLens on http://localhost:8080 using the default user credentials: -| Username | Password | -|---|---| +| Username | Password | +| --------------------------------- | ------------ | | `zitadel-admin@zitadel.localhost` | `Password1!` | You can use the same credentials to configure Zitadel and add new users using Zitadel control panel at http://localhost:8085/. **Don't forget to login there at least once to change the default password.** diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 3f468dc5..4df70577 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: pg-compeng: container_name: datalens-pg-compeng diff --git a/docker-compose.yml b/docker-compose.yml index ec49471d..0edd3a11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: pg-compeng: container_name: datalens-pg-compeng diff --git a/docker-compose.zitadel.yml b/docker-compose.zitadel.yml index ee2e35a5..9d0d493f 100644 --- a/docker-compose.zitadel.yml +++ b/docker-compose.zitadel.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: pg-compeng: container_name: datalens-pg-compeng diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2 index 44edb603..e8a9f414 100644 --- a/templates/docker-compose.j2 +++ b/templates/docker-compose.j2 @@ -1,5 +1,3 @@ -version: "3.7" - services: pg-compeng: container_name: datalens-pg-compeng diff --git a/templates/docker-compose.zitadel.j2 b/templates/docker-compose.zitadel.j2 index 50f82212..5a5b928f 100644 --- a/templates/docker-compose.zitadel.j2 +++ b/templates/docker-compose.zitadel.j2 @@ -1,5 +1,3 @@ -version: "3.7" - services: pg-compeng: container_name: datalens-pg-compeng