Skip to content

Commit

Permalink
Remove obsolete version directive (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
goshander authored Oct 7, 2024
1 parent cf763e7 commit 55ce222
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 16 deletions.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/) | `<string>` |
| 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/) | `<string>` |

```bash
YANDEX_MAP_ENABLED=1 YANDEX_MAP_TOKEN=XXXXXXXXX docker compose up
Expand Down Expand 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 |
| --------------------------------- | ------------ |
| `[email protected]` | `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.**
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
pg-compeng:
container_name: datalens-pg-compeng
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
pg-compeng:
container_name: datalens-pg-compeng
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.zitadel.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
pg-compeng:
container_name: datalens-pg-compeng
Expand Down
2 changes: 0 additions & 2 deletions templates/docker-compose.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
pg-compeng:
container_name: datalens-pg-compeng
Expand Down
2 changes: 0 additions & 2 deletions templates/docker-compose.zitadel.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
pg-compeng:
container_name: datalens-pg-compeng
Expand Down

0 comments on commit 55ce222

Please sign in to comment.