LAB-linuxserver/docker-ci
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ci.git synced 2026-02-04 18:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set DOCKER_LOGS_TIMEOUT to 120 default.

Browse Source 
Remove deprecation warnings on unused envs.
This commit is contained in:
Marius 2024-05-09 00:26:38 +02:00
parent 6afa2060c0
commit 587638fbc8
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -52,7 +52,7 @@ sudo docker run --rm -i \
-e SSL=<optional , use ssl for the screenshot true/false. Defaults to 'false'> \
-e CI_S6_VERBOSITY=<optional, Updates the S6_VERBOSITY env. Defaults to '2'> \
-e CI_LOG_LEVEL=<optional, Sets the ci logging level. Defaults to 'INFO'> \
-e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '900'> \
-e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '120'> \
-e DRY_RUN=<optional, Set to 'true' when you don't want to upload files to S3 when testing>
-t lsiodev/ci:latest \
python3 test_build.py

12
ci/ci.py
View File

@ -74,19 +74,15 @@ 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", os.environ.get("WEB_SCREENSHOT_DELAY", "120"))
self.screenshot_timeout: int = os.environ.get("WEB_SCREENSHOT_TIMEOUT", "120")
self.screenshot_delay: int = os.environ.get("SCREENSHOT_DELAY", "10")
self.logs_timeout: int = os.environ.get("DOCKER_LOGS_TIMEOUT", os.environ.get("DOCKER_LOGS_DELAY","900"))
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")
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")
if os.environ.get("WEB_SCREENSHOT_DELAY"):
self.logger.warning("WEB_SCREENSHOT_DELAY env is deprecated, please use WEB_SCREENSHOT_TIMEOUT instead")
if os.environ.get("DOCKER_LOGS_DELAY"):
self.logger.warning("DOCKER_LOGS_DELAY env is deprecated, please use DOCKER_LOGS_TIMEOUT instead")
if os.environ.get("DELAY_START"):
self.logger.warning("DELAY_START env is obsolete, and not in use anymore")
if os.environ.get("DOCKER_VOLUMES"):
@ -113,10 +109,8 @@ class SetEnvs():
WEB_PATH: '{os.environ.get("WEB_PATH")}'
WEB_SCREENSHOT: '{os.environ.get("WEB_SCREENSHOT")}'
WEB_SCREENSHOT_TIMEOUT: '{os.environ.get("WEB_SCREENSHOT_TIMEOUT")}'
WEB_SCREENSHOT_DELAY: '{os.environ.get("WEB_SCREENSHOT_DELAY")}' (Deprecated)
SCREENSHOT_DELAY: '{os.environ.get("SCREENSHOT_DELAY")}'
DOCKER_LOGS_TIMEOUT: '{os.environ.get("DOCKER_LOGS_TIMEOUT")}'
DOCKER_LOGS_DELAY: '{os.environ.get("DOCKER_LOGS_DELAY")}' (Deprecated)
SBOM_TIMEOUT: '{os.environ.get("SBOM_TIMEOUT")}'
DELAY_START: '{os.environ.get("DELAY_START")}' (Not in use)
PORT: '{os.environ.get("PORT")}'

2
readme-vars.yml
View File

@ -56,7 +56,7 @@ full_custom_readme: |
-e SSL=<optional , use ssl for the screenshot true/false. Defaults to 'false'> \
-e CI_S6_VERBOSITY=<optional, Updates the S6_VERBOSITY env. Defaults to '2'> \
-e CI_LOG_LEVEL=<optional, Sets the ci logging level. Defaults to 'INFO'> \
-e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '900'> \
-e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '120'> \
-e DRY_RUN=<optional, Set to 'true' when you don't want to upload files to S3 when testing>
-t lsiodev/ci:latest \
python3 test_build.py