Skip to content

Commit

Permalink
Merge branch 'main' into adapt_grafana_metrics_file_for_stateestimati…
Browse files Browse the repository at this point in the history
…on_orchestrator_server
  • Loading branch information
FranckLecuyer authored Dec 2, 2024
2 parents df8c4a4 + f8341c6 commit 467ede4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ If you opt for the S3 option and the minio container, you have to define the fol

You can choose the filesystem option explicitly with : **STORAGE_TYPE=FS**

| :warning: This environment variable must be set and subdirectories created before running any containers with docker-compose ! |

| :warning: These environment variables must be set and subdirectories created before running any containers with docker-compose ! |
|---------------------------------------------------------------------------------------------------------------------------------|


Expand Down Expand Up @@ -266,6 +267,17 @@ Grafana UI:
http://localhost:7000
```

### Minio console

Minio management UI:

```html
http://localhost:19090
default credentials :
- username : minioadmin
- password : minioadmin
```


### Installing / Updating docker-compose to v2
[Docker compose v2](https://github.com/docker/compose) is necessary to be able to use this compose project which uses [profiles feature](https://docs.docker.com/compose/profiles/).
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/technical/docker-compose.technical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ services:
# need to override entrypoint to create the bucket, is there a simpler way ?
entrypoint: sh
# We couldn't find yet another way to conditionnally start or not the minio container. Better solution appreciated.
command: -c '[ "$STORAGE_TYPE" = "S3" ] || exit 0; mkdir -p /data/bucket-gridsuite && /usr/bin/docker-entrypoint.sh server /data --console-address ":9090"'
command: -c '[ "${STORAGE_TYPE-FS}" = "S3" ] || exit 0; mkdir -p /data/bucket-gridsuite && /usr/bin/docker-entrypoint.sh server /data --console-address ":19090"'
ports:
- "19000:9000"
- "19090:9090"
- "19090:19090"
volumes:
- $GRIDSUITE_DATABASES/cases_v1/miniodata:/data:Z
restart: on-failure
Expand Down

0 comments on commit 467ede4

Please sign in to comment.