Simple implementation of LACONIC_HOSTED_ENDPOINT (#342 )

Former-commit-id: 172300d7bd
Default token needs to be empty string (#341 )
2023-04-17 20:46:05 -06:00 · 2023-04-17 13:53:16 -06:00
4 changed files with 8 additions and 5 deletions
@@ -85,7 +85,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
    # TODO: make this configurable
    container_build_env = {
        "CERC_NPM_REGISTRY_URL": config("CERC_NPM_REGISTRY_URL", default="http://gitea.local:3000/api/packages/cerc-io/npm/"),
-        "CERC_NPM_AUTH_TOKEN": config("CERC_NPM_AUTH_TOKEN", default="<token-not-supplied>"),
+        "CERC_NPM_AUTH_TOKEN": config("CERC_NPM_AUTH_TOKEN", default=""),
        "CERC_REPO_BASE_DIR": dev_root_path,
        "CERC_CONTAINER_BASE_DIR": container_build_dir,
        "CERC_HOST_UID": f"{os.getuid()}",
@@ -2,5 +2,7 @@ services:
  laconic-console:
    restart: unless-stopped
    image: cerc/laconic-console-host:local
+    environment:
+      - LACONIC_HOSTED_ENDPOINT=${LACONIC_HOSTED_ENDPOINT:-http://localhost}
    ports:
      - "80"
@@ -26,9 +26,10 @@ do
    kv_pair=(${kv_pair_string//=/ })
    template_string_to_replace=${kv_pair[0]}
    template_value_to_substitute=${kv_pair[1]}
+    template_value_to_substitute_expanded=${template_value_to_substitute//LACONIC_HOSTED_ENDPOINT/${LACONIC_HOSTED_ENDPOINT}}
    # Run find and sed to do the substitution of one variable over all files
    # See: https://stackoverflow.com/a/21479607/1701505
-    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute}"
+    echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute_expanded}"
    # Note: we do not escape our strings, on the expectation they do not container the '#' char.
-    find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute}'#g' {} +
+    find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute_expanded}'#g' {} +
 done
@@ -2,5 +2,5 @@

 services:
  wns:
-    server: 'http://localhost:9473/api'
-    webui: 'http://localhost:9473/console'
+    server: 'LACONIC_HOSTED_ENDPOINT:9473/api'
+    webui: 'LACONIC_HOSTED_ENDPOINT:9473/console'
Author	SHA1	Message	Date
dboreham	cb72e5c03f	Simple implementation of LACONIC_HOSTED_ENDPOINT (#342 ) Former-commit-id: `172300d7bd`	2023-04-17 20:46:05 -06:00
dboreham	c7a4d3f4e7	Default token needs to be empty string (#341 ) Former-commit-id: `99aa1fa27e`	2023-04-17 13:53:16 -06:00