Fix Docker auths script to use environment variable values and handle…

apolo_extras/assets/merge_docker_auths.sh

@@ -14,7 +14,7 @@ then
     fi
     for auth in ${extra_auths}; do
         key="${auth%%=*}"
-        value="${auth#*=}"
+        value=$(printenv $key)
         if [ -f "${value}" ]; then
             # ENV var points to the file
             jq < ${value} > /dev/null 2>&1 && res=`echo $res | cat - ${value} | jq -sc 'reduce .[] as $item ({}; . * $item)'`

apolo_extras/image.py

@@ -362,7 +362,12 @@ async def _build_image(
             client, image_uri_str, project_name, scheme="image"
         )
     async with get_platform_client(cluster=cluster) as client:
-        image_uri = client.parse.str_to_uri(image_uri_str, project_name=project_name)
+        try:
+            image_uri = str(
+                client.parse.str_to_uri(image_uri_str, project_name=project_name)
+            )
+        except ValueError:
+            image_uri = image_uri_str
         image = await _parse_platform_image(str(image_uri))
         context_uri = client.parse.str_to_uri(
             context,

tests/unit/image/conftest.py

@@ -41,6 +41,7 @@ def _get_mock_clusters() -> t.Dict[str, apolo_sdk.Cluster]:
             resource_pools={},
             presets=_get_mock_presets(),
             orgs=[],
+            apps=apolo_sdk.AppsConfig(),
         ),
     }