diff options
author | lolcat <lolcat@no-reply@lolcat.ca> | 2024-02-17 18:25:41 -0600 |
---|---|---|
committer | lolcat <lolcat@no-reply@lolcat.ca> | 2024-02-17 18:25:41 -0600 |
commit | edc917f5ee984160a0eef436dabd51696d675964 (patch) | |
tree | 1289260aea900576c13db710e8e0bef4ce4e5315 | |
parent | b078751e5b6465a388673f45925fa2f4ec3a6443 (diff) | |
parent | 2e4a14cf167a909f087032d39745e1fd118b078a (diff) |
Merge pull request 'fix numeric values being set as string' (#40) from feature/fix_numeric into master
Reviewed-on: https://git.lolcat.ca/lolcat/4get/pulls/40
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | docker/gen_config.php | 12 |
2 files changed, 11 insertions, 3 deletions
@@ -177,6 +177,8 @@ any environment variables prefixed with `FOURGET_` will be added to the generate the entrypoint will automatically set the `CAPTCHA_DATASET` value for you based on directory names and number of files in each +to set `INSTANCES` pass a comma separated string of urls (FOURGET_INSTANCES = "https://4get.ca,https://domain.tld") + ``` version: "3.7" diff --git a/docker/gen_config.php b/docker/gen_config.php index b7e036e..dff39cb 100644 --- a/docker/gen_config.php +++ b/docker/gen_config.php @@ -25,6 +25,9 @@ function type_to_string($n) { return $n ? 'true' : 'false'; } if ($type === "string") { + if(is_numeric($n)) { + return $n; + } return "\"$n\""; } if ($type === "array") { @@ -49,7 +52,7 @@ function detect_captcha_dirs() { } -$special_keys = ["CAPTCHA_DATASET"]; +$special_keys = ["CAPTCHA_DATASET", "INSTANCES"]; $output = "<?php\n // This file was generated by docker/gen_config.php\n"; @@ -61,8 +64,11 @@ continue; } -if($key === "CAPTCHA_DATASET") { - $output = $output . "\tconst " . $key . " = " . type_to_string(detect_captcha_dirs()) . ";\n"; + if($key === "CAPTCHA_DATASET") { + $output = $output . "\tconst " . $key . " = " . type_to_string(detect_captcha_dirs()) . ";\n"; + } + if($key === "INSTANCES") { + $output = $output . "\tconst " . $key . " = " . type_to_string(explode(',', $val)) . ";\n"; } } |