소스 검색

Set LOCAL_API_URL on regeneration of local agent (#1226)

The local agent credentials file contains the URL for the local API endpoint. If you set it through the environment variable, it is not honored when regenerating the URL for the localhost machine.

This PR will set the LOCAL_API_URL on the regeneration of credentials if it's defined.
Andreas Krüger 3 년 전
부모
커밋
d5f17ee377
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      docker/docker_start.sh

+ 5 - 1
docker/docker_start.sh

@@ -22,7 +22,11 @@ fi
 if [ "$DISABLE_AGENT" == "" ] ; then
     echo "Regenerate local agent credentials"
     cscli -c "$CS_CONFIG_FILE" machines delete localhost
-    cscli -c "$CS_CONFIG_FILE" machines add localhost --auto
+    if [ "$LOCAL_API_URL" != "" ] ; then
+        cscli -c "$CS_CONFIG_FILE" machines add localhost --auto --url $LOCAL_API_URL
+    else
+        cscli -c "$CS_CONFIG_FILE" machines add localhost --auto
+    fi
     if [ "$AGENT_USERNAME" != "" ] && [ "$AGENT_PASSWORD" != "" ] && [ "$LOCAL_API_URL" != "" ] ; then
         echo "set up lapi credentials for agent"
         CONFIG_PATH=$(yq eval '.api.client.credentials_path' "$CS_CONFIG_FILE" )