diff --git a/components/clp-py-utils/clp_py_utils/clp_config.py b/components/clp-py-utils/clp_py_utils/clp_config.py index 0da114232b..8c8352baab 100644 --- a/components/clp-py-utils/clp_py_utils/clp_config.py +++ b/components/clp-py-utils/clp_py_utils/clp_config.py @@ -48,8 +48,8 @@ COMPRESSION_TASKS_TABLE_NAME = "compression_tasks" # Paths -CONTAINER_AWS_CONFIG_DIRECTORY = pathlib.Path("/") / ".aws" CONTAINER_CLP_HOME = pathlib.Path("/") / "opt" / "clp" +CONTAINER_AWS_CONFIG_DIRECTORY = CONTAINER_CLP_HOME / ".aws" CONTAINER_INPUT_LOGS_ROOT_DIR = pathlib.Path("/") / "mnt" / "logs" CLP_DEFAULT_CONFIG_FILE_RELATIVE_PATH = pathlib.Path("etc") / "clp-config.yml" CLP_DEFAULT_CREDENTIALS_FILE_PATH = pathlib.Path("etc") / "credentials.yml" diff --git a/tools/deployment/package/docker-compose.base.yaml b/tools/deployment/package/docker-compose.base.yaml index ac2b422159..e088e8c542 100644 --- a/tools/deployment/package/docker-compose.base.yaml +++ b/tools/deployment/package/docker-compose.base.yaml @@ -229,7 +229,7 @@ services: volumes: - *volume_clp_config_readonly - *volume_clp_logs - - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/.aws:ro" + - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_LOGS_INPUT_DIR_HOST:-empty}:${CLP_LOGS_INPUT_DIR_CONTAINER:-/mnt/logs}" depends_on: db-table-creator: @@ -263,7 +263,7 @@ services: - *volume_clp_config_readonly - *volume_clp_logs - "${CLP_ARCHIVE_OUTPUT_DIR_HOST:-empty}:/var/data/archives" - - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/.aws:ro" + - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_LOGS_INPUT_DIR_HOST:-empty}:${CLP_LOGS_INPUT_DIR_CONTAINER:-/mnt/logs}" - "${CLP_STAGED_ARCHIVE_OUTPUT_DIR_HOST:-empty}:/var/data/staged-archives" - type: "bind" @@ -300,7 +300,7 @@ services: published: "${CLP_WEBUI_PORT:-4000}" target: 4000 volumes: - - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/.aws:ro" + - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_STREAM_OUTPUT_DIR_HOST:-empty}:/var/data/streams" - type: "bind" source: "./var/www/webui/client/settings.json" @@ -346,7 +346,7 @@ services: - *volume_clp_config_readonly - *volume_clp_logs - "${CLP_ARCHIVE_OUTPUT_DIR_HOST:-empty}:/var/data/archives" - - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/.aws:ro" + - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_STREAM_OUTPUT_DIR_HOST:-empty}:/var/data/streams" depends_on: db-table-creator: diff --git a/tools/deployment/package/docker-compose.yaml b/tools/deployment/package/docker-compose.yaml index e05c49792e..dc5bcadf73 100644 --- a/tools/deployment/package/docker-compose.yaml +++ b/tools/deployment/package/docker-compose.yaml @@ -85,7 +85,7 @@ services: - *volume_clp_config_readonly - *volume_clp_logs - "${CLP_ARCHIVE_OUTPUT_DIR_HOST:-empty}:/var/data/archives" - - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/.aws:ro" + - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_STAGED_STREAM_OUTPUT_DIR_HOST:-empty}:/var/data/staged-streams" - "${CLP_STREAM_OUTPUT_DIR_HOST:-empty}:/var/data/streams" command: [