From ce01e37c665d4ad39e43f6b46f0a6a0b99a1f22c Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Wed, 26 Jun 2024 10:53:43 +0300
Subject: [PATCH] Refactor docker compose files: remove legacy, add services
 agent initialization in Linux

---
 docker/docker-compose-win10.yml | 2 --
 docker/docker-compose.yml       | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/docker-compose-win10.yml b/docker/docker-compose-win10.yml
index a789844..6f52412 100644
--- a/docker/docker-compose-win10.yml
+++ b/docker/docker-compose-win10.yml
@@ -29,8 +29,6 @@ services:
       CLEARML__apiserver__pre_populate__artifacts_path: "/mnt/fileserver"
       CLEARML__services__async_urls_delete__enabled: "true"
       CLEARML__services__async_urls_delete__fileserver__url_prefixes: "[${CLEARML_FILES_HOST:-}]"
-      CLEARML__secure__credentials__services_agent__user_key: ${CLEARML_AGENT_ACCESS_KEY:-}
-      CLEARML__secure__credentials__services_agent__user_secret: ${CLEARML_AGENT_SECRET_KEY:-}
     ports:
     - "8008:8008"
     networks:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 970b47b..07f7f43 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -165,8 +165,8 @@ services:
       CLEARML_WEB_HOST: ${CLEARML_WEB_HOST:-}
       CLEARML_API_HOST: http://apiserver:8008
       CLEARML_FILES_HOST: ${CLEARML_FILES_HOST:-}
-      CLEARML_API_ACCESS_KEY: ${CLEARML_AGENT_ACCESS_KEY:-}
-      CLEARML_API_SECRET_KEY: ${CLEARML_AGENT_SECRET_KEY:-}
+      CLEARML_API_ACCESS_KEY: ${CLEARML_AGENT_ACCESS_KEY:-$CLEARML_API_ACCESS_KEY}
+      CLEARML_API_SECRET_KEY: ${CLEARML_AGENT_SECRET_KEY:-$CLEARML_API_SECRET_KEY}
       CLEARML_AGENT_GIT_USER: ${CLEARML_AGENT_GIT_USER}
       CLEARML_AGENT_GIT_PASS: ${CLEARML_AGENT_GIT_PASS}
       CLEARML_AGENT_UPDATE_VERSION: ${CLEARML_AGENT_UPDATE_VERSION:->=0.17.0}