Skip to content

Commit 33a92be

Browse files
Bot Updating Templated Files
1 parent cdc5fdd commit 33a92be

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
@@ -94,7 +94,11 @@ pipeline {
9494
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
9595
env.PULL_REQUEST = env.CHANGE_ID
9696
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'
97+
if ( env.SYFT_IMAGE_TAG == null ) {
98+
env.SYFT_IMAGE_TAG = 'latest'
99+
}
97100
}
101+
echo "Using syft image tag ${SYFT_IMAGE_TAG}"
98102
sh '''#! /bin/bash
99103
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
100104
script{
@@ -714,7 +718,7 @@ pipeline {
714718
docker run --rm \
715719
-v /var/run/docker.sock:/var/run/docker.sock:ro \
716720
-v ${TEMPDIR}:/tmp \
717-
ghcr.io/anchore/syft:v1.26.1 \
721+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
718722
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
719723
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
720724
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -824,6 +828,7 @@ pipeline {
824828
-e WEB_AUTH=\"${CI_AUTH}\" \
825829
-e WEB_PATH=\"${CI_WEBPATH}\" \
826830
-e NODE_NAME=\"${NODE_NAME}\" \
831+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
827832
-t ghcr.io/linuxserver/ci:latest \
828833
python3 test_build.py'''
829834
}

0 commit comments

Comments
 (0)