From 9831b910d2dd98d5aac50810fab76da7e6edcc6d Mon Sep 17 00:00:00 2001 From: GilbN <24592972+GilbN@users.noreply.github.com> Date: Sun, 2 Jun 2024 13:00:47 +0200 Subject: [PATCH] Make sure the numeric values are set even if they are set to empty strings in the environment. Fixes #38 --- ci/ci.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ci/ci.py b/ci/ci.py index 203b04f..38c8d8b 100755 --- a/ci/ci.py +++ b/ci/ci.py @@ -74,11 +74,14 @@ class SetEnvs(): self.webauth: str = os.environ.get("WEB_AUTH", "user:password") self.webpath: str = os.environ.get("WEB_PATH", "") self.screenshot: bool = os.environ.get("WEB_SCREENSHOT", "false").lower() == "true" - self.screenshot_timeout: int = os.environ.get("WEB_SCREENSHOT_TIMEOUT", "120") - self.screenshot_delay: int = os.environ.get("WEB_SCREENSHOT_DELAY", "10") - self.logs_timeout: int = os.environ.get("DOCKER_LOGS_TIMEOUT", "120") - self.sbom_timeout: int = os.environ.get("SBOM_TIMEOUT", "900") - self.port: int = os.environ.get("PORT", "80") + + # Make sure the numeric values are set even if they are set to empty strings in the environment + self.screenshot_timeout: int = (os.environ.get("WEB_SCREENSHOT_TIMEOUT", "120") or "120") + self.screenshot_delay: int = (os.environ.get("WEB_SCREENSHOT_DELAY", "10") or "10") + self.logs_timeout: int = (os.environ.get("DOCKER_LOGS_TIMEOUT", "120") or "120") + self.sbom_timeout: int = (os.environ.get("SBOM_TIMEOUT", "120") or "120") + self.port: int = (os.environ.get("PORT", "80") or "80") + self.ssl: str = os.environ.get("SSL", "false") self.region: str = os.environ.get("S3_REGION", "us-east-1") self.bucket: str = os.environ.get("S3_BUCKET", "ci-tests.linuxserver.io")