diff --git a/yonote-docker-compose/.env.sample b/yonote-docker-compose/.env.sample index e85d6a1..2c60376 100644 --- a/yonote-docker-compose/.env.sample +++ b/yonote-docker-compose/.env.sample @@ -29,11 +29,13 @@ KC_DB=keycloak KC_DB_USERNAME=keycloak KC_DB_PASSWORD=keycloak +KC_CLIENT_SECRET= + # Адрес сервера S3/Minio (с http/https) MINIO_YNT_HOST=s3.domain.ru MINIO_ADMIN_YNT_HOST=s3-admin.domain.ru MINIO_YNT_HOST_PROTOCOL=http:// -MINIO_YNT_URL=${MINIO_YNT_HOST}${MINIO_YNT_HOST_PROTOCOL} +MINIO_YNT_URL=${MINIO_YNT_HOST_PROTOCOL}${MINIO_YNT_HOST} # Логин и пароль для администратора S3 (пользователь создается автоматически) MINIO_ADMIN_USERNAME=admin MINIO_ADMIN_PASSWORD=adminadmin diff --git a/yonote-docker-compose/docker-compose.yml b/yonote-docker-compose/docker-compose.yml index b8c45e3..9342338 100644 --- a/yonote-docker-compose/docker-compose.yml +++ b/yonote-docker-compose/docker-compose.yml @@ -86,6 +86,11 @@ services: - minio:/data networks: - yonote-network + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] + interval: 5s + timeout: 5s + retries: 5 s3-client: container_name: minio-client @@ -110,7 +115,8 @@ services: networks: - yonote-network depends_on: - - s3 + s3: + condition: service_healthy keycloak: container_name: keycloak