Skip to content

Commit 9cc7bc1

Browse files
committed
Rebase to 3.22
1 parent e5099e9 commit 9cc7bc1

12 files changed

Lines changed: 31 additions & 9 deletions

.editorconfig

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request_review:
99
types: [submitted,edited,dismissed]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
manage-project:
1316
permissions:

.github/workflows/call_issues_cron.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
- cron: '58 11 * * *'
55
workflow_dispatch:
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
stale:
912
permissions:

.github/workflows/external_trigger.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: External Trigger Main
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
external-trigger-main:
811
runs-on: ubuntu-latest

.github/workflows/external_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '38 * * * *'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
external-trigger-scheduler:
1013
runs-on: ubuntu-latest

.github/workflows/greetings.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ name: Greetings
22

33
on: [pull_request_target, issues]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
greeting:
10+
permissions:
11+
issues: write
12+
pull-requests: write
713
runs-on: ubuntu-latest
814
steps:
915
- uses: actions/first-interaction@v1

.github/workflows/package_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '59 8 * * 0'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
package-trigger-scheduler:
1013
runs-on: ubuntu-latest

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.22
44

55
ARG BUILD_DATE
66
ARG VERSION

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22
44

55
ARG BUILD_DATE
66
ARG VERSION

Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ pipeline {
8888
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
8989
env.PULL_REQUEST = env.CHANGE_ID
9090
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'
91+
if ( env.SYFT_IMAGE_TAG == null ) {
92+
env.SYFT_IMAGE_TAG = 'latest'
93+
}
9194
}
95+
echo "Using syft image tag ${SYFT_IMAGE_TAG}"
9296
sh '''#! /bin/bash
9397
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
9498
script{
@@ -709,7 +713,7 @@ pipeline {
709713
docker run --rm \
710714
-v /var/run/docker.sock:/var/run/docker.sock:ro \
711715
-v ${TEMPDIR}:/tmp \
712-
ghcr.io/anchore/syft:v1.26.1 \
716+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
713717
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
714718
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
715719
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -818,6 +822,7 @@ pipeline {
818822
-e WEB_AUTH=\"${CI_AUTH}\" \
819823
-e WEB_PATH=\"${CI_WEBPATH}\" \
820824
-e NODE_NAME=\"${NODE_NAME}\" \
825+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
821826
-t ghcr.io/linuxserver/ci:latest \
822827
python3 test_build.py'''
823828
}

0 commit comments

Comments
 (0)