Skip to content

Commit

Permalink
fix: add env variables for search
Browse files Browse the repository at this point in the history
  • Loading branch information
utnapischtim committed Nov 19, 2024
1 parent d920a3d commit 6f3ac22
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
1 change: 1 addition & 0 deletions docker_services_cli/cli.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2020 CERN.
# Copyright (C) 2024 Graz University of Technology.
#
# Docker-Services-CLI is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more details.
Expand Down
29 changes: 23 additions & 6 deletions docker_services_cli/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@
"OPENSEARCH_1_LATEST": "1.3.18",
"OPENSEARCH_2_LATEST": "2.16.0",
},
"CONTAINER_CONNECTION_ENVIRONMENT_VARIABLES": {
"search": {
"INVENIO_SEARCH_HOSTS": "http://127.0.0.1:9201",
"SEARCH_HOSTS": "http://127.0.0.1:9201",
}
},
}
"""Opensearch service configuration."""

Expand All @@ -63,7 +69,7 @@
},
"CONTAINER_CONNECTION_ENVIRONMENT_VARIABLES": {
"db": {
"SQLALCHEMY_DATABASE_URI": "postgresql+psycopg2://invenio:invenio@localhost:5433/invenio"
"SQLALCHEMY_DATABASE_URI": "postgresql+psycopg2://invenio:invenio@localhost:5433/invenio",
}
},
}
Expand Down Expand Up @@ -94,8 +100,21 @@
"REDIS_7_LATEST": "7",
},
"CONTAINER_CONNECTION_ENVIRONMENT_VARIABLES": {
"mq": {"BROKER_URL": "redis://localhost:6380/0"},
"cache": {"CACHE_TYPE": "redis"},
"mq": {
"CACHE_REDIS_PORT": "6380",
"BROKER_URL": "redis://localhost:6380/0",
"CELERY_BROKER_URL": "redis://127.0.0.1:6380/0",
"CACHE_REDIS_URL": "redis://127.0.0.1:6380/0",
"CELERY_RESULT_BACKEND": "redis://127.0.0.1:6380/2",
},
"cache": {
"CACHE_TYPE": "redis",
"CACHE_REDIS_PORT": "6380",
"BROKER_URL": "redis://127.0.0.1:6380/0",
"CELERY_BROKER_URL": "redis://127.0.0.1:6380/0",
"CACHE_REDIS_URL": "redis://127.0.0.1:6380/0",
"CELERY_RESULT_BACKEND": "redis://127.0.0.1:6380/2",
},
},
}
"""Redis service configuration."""
Expand Down Expand Up @@ -132,9 +151,7 @@
SERVICE_TYPES = {
"search": ["opensearch", "elasticsearch"],
"db": ["mysql", "postgresql"],
"cache": [
"redis",
],
"cache": ["redis"],
"mq": ["rabbitmq", "redis"],
}
"""Types of offered services."""

0 comments on commit 6f3ac22

Please sign in to comment.