Skip to content

Commit 17c0c33

Browse files
Bot Updating Templated Files
1 parent f5725bf commit 17c0c33

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ pipeline {
9898
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
9999
env.PULL_REQUEST = env.CHANGE_ID
100100
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'
101+
if ( env.SYFT_IMAGE_TAG == null ) {
102+
env.SYFT_IMAGE_TAG = 'latest'
103+
}
101104
}
105+
echo "Using syft image tag ${SYFT_IMAGE_TAG}"
102106
sh '''#! /bin/bash
103107
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
104108
script{
@@ -791,7 +795,7 @@ pipeline {
791795
docker run --rm \
792796
-v /var/run/docker.sock:/var/run/docker.sock:ro \
793797
-v ${TEMPDIR}:/tmp \
794-
ghcr.io/anchore/syft:v1.26.1 \
798+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
795799
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
796800
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
797801
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -901,6 +905,7 @@ pipeline {
901905
-e WEB_AUTH=\"${CI_AUTH}\" \
902906
-e WEB_PATH=\"${CI_WEBPATH}\" \
903907
-e NODE_NAME=\"${NODE_NAME}\" \
908+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
904909
-t ghcr.io/linuxserver/ci:latest \
905910
python3 test_build.py'''
906911
}

0 commit comments

Comments
 (0)