Skip to content

Commit c422f29

Browse files
Bot Updating Templated Files
1 parent 3173d60 commit c422f29

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,11 @@ pipeline {
9797
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
9898
env.PULL_REQUEST = env.CHANGE_ID
9999
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
100+
if ( env.SYFT_IMAGE_TAG == null ) {
101+
env.SYFT_IMAGE_TAG = 'latest'
102+
}
100103
}
104+
echo "Using syft image tag ${SYFT_IMAGE_TAG}"
101105
sh '''#! /bin/bash
102106
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
103107
script{
@@ -790,7 +794,7 @@ pipeline {
790794
docker run --rm \
791795
-v /var/run/docker.sock:/var/run/docker.sock:ro \
792796
-v ${TEMPDIR}:/tmp \
793-
ghcr.io/anchore/syft:v1.26.1 \
797+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
794798
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
795799
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
796800
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -900,6 +904,7 @@ pipeline {
900904
-e WEB_AUTH=\"${CI_AUTH}\" \
901905
-e WEB_PATH=\"${CI_WEBPATH}\" \
902906
-e NODE_NAME=\"${NODE_NAME}\" \
907+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
903908
-t ghcr.io/linuxserver/ci:latest \
904909
python3 test_build.py'''
905910
}

0 commit comments

Comments
 (0)