diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 6271681..52cbca0 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ sudo docker run --rm -i \ -e DRY_RUN= \ -e NODE_NAME= \ -e RELEASE_TAG= \ +-e SYFT_IMAGE_TAG= \ -t lsiodev/ci:latest \ python3 test_build.py ``` diff --git a/ci/ci.py b/ci/ci.py index 7462fdf..4c8c412 100755 --- a/ci/ci.py +++ b/ci/ci.py @@ -87,6 +87,7 @@ def __init__(self) -> None: self.region: str = os.environ.get("S3_REGION", "us-east-1") self.bucket: str = os.environ.get("S3_BUCKET", "ci-tests.linuxserver.io") self.release_tag: str = os.environ.get("RELEASE_TAG", "latest") + self.syft_image_tag: str = os.environ.get("SYFT_IMAGE_TAG", "v1.26.1") if os.environ.get("DELAY_START"): self.logger.warning("DELAY_START env is obsolete, and not in use anymore") @@ -124,6 +125,7 @@ def __init__(self) -> None: SSL: '{os.environ.get("SSL")}' S3_REGION: '{os.environ.get("S3_REGION")}' S3_BUCKET: '{os.environ.get("S3_BUCKET")}' + SYFT_IMAGE_TAG: '{os.environ.get("SYFT_IMAGE_TAG")}' Docker Engine Version: '{self.get_docker_engine_version()}' """) self.logger.info(env_data) @@ -452,9 +454,9 @@ def generate_sbom(self, tag:str) -> str: """ start_time = time.time() platform: str = self.get_platform(tag) - syft:Container = self.client.containers.run(image="ghcr.io/anchore/syft:v1.26.1",command=f"{self.image}:{tag} --platform=linux/{platform}", + syft:Container = self.client.containers.run(image=f"ghcr.io/anchore/syft:{self.syft_image_tag}",command=f"{self.image}:{tag} --platform=linux/{platform}", detach=True, volumes={"/var/run/docker.sock": {"bind": "/var/run/docker.sock", "mode": "rw"}}) - self.logger.info("Creating SBOM package list on %s",tag) + self.logger.info("Creating SBOM package list on %s with syft version %s",tag,self.syft_image_tag) test = "Create SBOM" t_end: float = time.time() + self.sbom_timeout self.logger.info("Tailing the syft container logs for %s seconds looking the 'VERSION' message on tag: %s",self.sbom_timeout,tag) diff --git a/readme-vars.yml b/readme-vars.yml index e6de989..b45c148 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -57,6 +57,7 @@ full_custom_readme: | -e DRY_RUN= \ -e NODE_NAME= \ -e RELEASE_TAG= \ + -e SYFT_IMAGE_TAG= \ -t lsiodev/ci:latest \ python3 test_build.py ```