changed method name and added doc for docker compose

[jirafeau_project.git] / docker / docker_config.php

diff --git a/docker/docker_config.php b/docker/docker_config.php
index 140149e4794213d9694dc177fb2be9a035ad7e9d..6037ec6434c17337d19c033b205d69f904e191c2 100644 (file)
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -91,7 +91,7 @@ function env_2_cfg_string_array(&$cfg, $config_name)
     return true;
 }
 
     return true;
 }
 

-function env_2_cfg_string_array_key_value(&$cfg, $config_name)
+function env_2_cfg_array_from_json(&$cfg, $config_name)

 {
     $env_name = strtoupper($config_name);
     $env_string = getenv($env_name);
 {
     $env_name = strtoupper($config_name);
     $env_string = getenv($env_name);


@@ -102,17 +102,15 @@ function env_2_cfg_string_array_key_value(&$cfg, $config_name)
     if (json_last_error() === JSON_ERROR_NONE) {
         // JSON is valid
         $c = count($result);
     if (json_last_error() === JSON_ERROR_NONE) {
         // JSON is valid
         $c = count($result);

-        echo ("setting $config_name array with $c value(s)n\n");
+        echo("setting $config_name array with $c value(s)n\n");

     } else {
     } else {

-        echo ("ERROR - invalid json for environment key $config_name \n");
-    } 
-    
+        echo("ERROR - invalid json for environment key $config_name \n");
+    }
+

     $cfg[$config_name] = $result;
     return true;
 }
 
     $cfg[$config_name] = $result;
     return true;
 }
 

-
-

 function setup_admin_password(&$cfg)
 {
     if (strlen($cfg['admin_password']) > 0) {
 function setup_admin_password(&$cfg)
 {
     if (strlen($cfg['admin_password']) > 0) {


@@ -203,7 +201,7 @@ function run_setup(&$cfg)
     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
     // this is a key value based value
     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
     // this is a key value based value

-    env_2_cfg_string_array_key_value($cfg, 'availabilities');
+    env_2_cfg_array_from_json($cfg, 'availabilities');

     env_2_cfg_bool($cfg, 'store_uploader_ip');
     env_2_cfg_string($cfg, 'download_password_requirement');
     env_2_cfg_int($cfg, 'download_password_gen_len');
     env_2_cfg_bool($cfg, 'store_uploader_ip');
     env_2_cfg_string($cfg, 'download_password_requirement');
     env_2_cfg_int($cfg, 'download_password_gen_len');