Skip to content

Commit a42dbd4

Browse files
committed
rebase with master
2 parents 48274ba + 729b95b commit a42dbd4

File tree

9 files changed

+48
-2
lines changed

9 files changed

+48
-2
lines 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: '35 22 * * *'
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-master:
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: '22 * * * *'
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: '8 12 * * 4'
66
workflow_dispatch:
77

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

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{
@@ -734,7 +738,7 @@ pipeline {
734738
docker run --rm \
735739
-v /var/run/docker.sock:/var/run/docker.sock:ro \
736740
-v ${TEMPDIR}:/tmp \
737-
ghcr.io/anchore/syft:v1.26.1 \
741+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
738742
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
739743
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
740744
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -844,6 +848,7 @@ pipeline {
844848
-e WEB_AUTH=\"${CI_AUTH}\" \
845849
-e WEB_PATH=\"${CI_WEBPATH}\" \
846850
-e NODE_NAME=\"${NODE_NAME}\" \
851+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
847852
-t ghcr.io/linuxserver/ci:latest \
848853
python3 test_build.py'''
849854
}

ansible/roles/documentation/templates/README_SNIPPETS/SELKIES.j2

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ This container is based on [Docker Baseimage Selkies](https://github.com/linuxse
2727
| `START_DOCKER` | If set to `false`, the privileged Docker-in-Docker setup will not start automatically. |
2828
| `DISABLE_IPV6` | Set to `true` to disable IPv6 support in the container. |
2929
| `LC_ALL` | Sets the container's locale, e.g., `fr_FR.UTF-8`. |
30+
| `DRINODE` | If mounting in /dev/dri for DRI3 GPU Acceleration allows you to specify the device to use IE `/dev/dri/renderD128` |
3031
| `NO_DECOR` | If set, applications will run without window borders, suitable for PWA usage. |
3132
| `NO_FULL` | If set, applications will not be automatically fullscreened. |
3233
| `DISABLE_ZINK` | If set, Zink-related environment variables will not be configured when a video card is detected. |
@@ -39,6 +40,7 @@ This container is based on [Docker Baseimage Selkies](https://github.com/linuxse
3940
| :----: | --- |
4041
| `--privileged` | Starts a Docker-in-Docker (DinD) environment. For better performance, mount the Docker data directory from the host, e.g., `-v /path/to/docker-data:/var/lib/docker`. |
4142
| `-v /var/run/docker.sock:/var/run/docker.sock` | Mounts the host's Docker socket to manage host containers from within this container. |
43+
| `--device /dev/dri:/dev/dri` | Mount a GPU into the container, this can be used in conjunction with the `DRINODE` environment variable to leverage a host video card for GPU accelerated applications. Only **Open Source** drivers are supported IE (Intel,AMDGPU,Radeon,ATI,Nouveau) |
4244

4345
### Language Support - Internationalization
4446

@@ -55,6 +57,24 @@ To launch the desktop session in a different language, set the `LC_ALL` environm
5557
* `-e LC_ALL=nl_NL.UTF-8` - Netherlands
5658
* `-e LC_ALL=it_IT.UTF-8` - Italian
5759

60+
### DRI3 GPU Acceleration
61+
62+
For accelerated apps or games, render devices can be mounted into the container and leveraged by applications using:
63+
64+
`--device /dev/dri:/dev/dri`
65+
66+
This feature only supports **Open Source** GPU drivers:
67+
68+
| Driver | Description |
69+
| :----: | --- |
70+
| Intel | i965 and i915 drivers for Intel iGPU chipsets |
71+
| AMD | AMDGPU, Radeon, and ATI drivers for AMD dedicated or APU chipsets |
72+
| NVIDIA | nouveau2 drivers only, closed source NVIDIA drivers lack DRI3 support |
73+
74+
The `DRINODE` environment variable can be used to point to a specific GPU.
75+
76+
DRI3 will work on aarch64 given the correct drivers are installed inside the container for your chipset.
77+
5878
{% if show_nvidia is defined %}### Nvidia GPU Support
5979

6080
**Note: Nvidia support is not available for Alpine-based images.**

ansible/roles/repository/templates/Jenkinsfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ pipeline {
12141214
-e WEB_AUTH=\"${CI_AUTH}\" \
12151215
-e WEB_PATH=\"${CI_WEBPATH}\" \
12161216
-e NODE_NAME=\"${NODE_NAME}\" \
1217-
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:${SYFT_IMAGE_TAG}}\" \
1217+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
12181218
-t ghcr.io/linuxserver/ci:latest \
12191219
python3 test_build.py'''
12201220
}

0 commit comments

Comments
 (0)