Skip to content

Commit 2bf0c07

Browse files
thespadthespad
authored
Merge pull request #316 from linuxserver/monthly
2 parents 85f8b85 + 1b95d0a commit 2bf0c07

6 files changed

Lines changed: 32 additions & 41 deletions

File tree

‎roles/generate-jenkins/defaults/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ unraid_template_sync: true
5858
unraid_template: true
5959
armhf_native: false
6060
build_armhf: false
61-
image_provenance: false
62-
image_sbom: false
61+
image_provenance: true
62+
image_sbom: true
6363
image_builder: 'container'

‎roles/generate-jenkins/templates/DOCUMENTATION.j2‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ title: {{ project_name }}
3333
{% if app_setup_block_enabled %}
3434
{% include "README_SNIPPETS/APPLICATION_SETUP.j2" | trim %}
3535

36-
{% if kasm_blurb is defined %}
37-
{% include "README_SNIPPETS/KASM.j2" | trim %}
38-
39-
{% endif %}
4036
{% if readonly_supported is defined and readonly_supported %}
4137
{% include "README_SNIPPETS/READONLY.j2" | trim %}
4238

@@ -64,6 +60,10 @@ title: {{ project_name }}
6460
{% if readme_media is defined and readme_media %}
6561
{% include "README_SNIPPETS/MEDIA.j2" | trim %}
6662

63+
{% endif %}
64+
{% if kasm_blurb is defined %}
65+
{% include "README_SNIPPETS/KASM.j2" | trim %}
66+
6767
{% endif %}
6868
{% endif %}
6969
{% include "README_SNIPPETS/USAGE.j2" | trim %}
@@ -224,4 +224,14 @@ Containers are configured using parameters passed at runtime (such as those abov
224224

225225
{% include "README_SNIPPETS/BUILDING_LOCALLY.j2" | trim %}
226226

227+
{% if init_diagram is defined and init_diagram %}
228+
To help with development, we generate this dependency graph.
229+
230+
??? info "Init dependency graph"
231+
232+
```d2
233+
{{ init_diagram | indent(4) | trim }}
234+
```
235+
236+
{% endif %}
227237
{% include "README_SNIPPETS/VERSIONS.j2" | trim %}

‎roles/generate-jenkins/templates/EXTERNAL_TRIGGER.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
else
183183
printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
184184
echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
185-
if "${artifacts_found}" == "true" ]]; then
185+
if [[ "${artifacts_found}" == "true" ]]; then
186186
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
187187
fi
188188
response=$(curl -iX POST \

‎roles/generate-jenkins/templates/Jenkinsfile.j2‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,9 @@ pipeline {
820820
for i in "${CACHE[@]}"; do
821821
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
822822
done
823-
wait
823+
for p in $(jobs -p); do
824+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
825+
done
824826
fi
825827
'''
826828
}
@@ -888,7 +890,9 @@ pipeline {
888890
for i in "${CACHE[@]}"; do
889891
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
890892
done
891-
wait
893+
for p in $(jobs -p); do
894+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
895+
done
892896
fi
893897
'''
894898
}
@@ -951,7 +955,9 @@ pipeline {
951955
for i in "${CACHE[@]}"; do
952956
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
953957
done
954-
wait
958+
for p in $(jobs -p); do
959+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
960+
done
955961
fi
956962
'''
957963
}
@@ -1241,32 +1247,7 @@ pipeline {
12411247
echo '{"tag_name":"'${META_TAG}'",\
12421248
"target_commitish": "{{ ls_branch }}",\
12431249
"name": "'${META_TAG}'",\
1244-
{% if custom_version_command is defined %}
1245-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1246-
{% endif %}
1247-
{% if external_type == "github_devel" %}
1248-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1249-
{% elif external_type == "github_stable" %}
1250-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1251-
{% elif external_type == "alpine_repo" %}
1252-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
1253-
{% elif external_type == "custom_json" %}
12541250
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1255-
{% elif external_type == "deb_repo" %}
1256-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
1257-
{% elif external_type == "external_blob" %}
1258-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1259-
{% elif external_type == "github_commit" %}
1260-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1261-
{% elif external_type == "gitlab_commit" %}
1262-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_GITLAB_PROJ}' Changes:**\\n\\n' > start
1263-
{% elif external_type == "npm_version" %}
1264-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**NPM Changes:**\\n\\n' > start
1265-
{% elif external_type == "os" %}
1266-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start
1267-
{% elif external_type == "pip_version" %}
1268-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start
1269-
{% elif external_type == "custom" %} "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Custom Changes:**\\n\\n' > start{% endif %}
12701251
printf '","draft": false,"prerelease": {% if release_type == "stable" %}false{% elif release_type == "prerelease" %}true{% endif %}}' >> releasebody.json
12711252
paste -d'\\0' start releasebody.json > releasebody.json.done
12721253
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

‎roles/generate-jenkins/templates/README.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
{% if app_setup_block_enabled %}
3333
{% include "README_SNIPPETS/APPLICATION_SETUP.j2" | trim %}
3434

35-
{% if kasm_blurb is defined %}
36-
{% include "README_SNIPPETS/KASM.j2" | trim %}
37-
38-
{% endif %}
3935
{% if readonly_supported is defined and readonly_supported %}
4036
{% include "README_SNIPPETS/READONLY.j2" | trim %}
4137

@@ -63,6 +59,10 @@
6359
{% if readme_media is defined and readme_media %}
6460
{% include "README_SNIPPETS/MEDIA.j2" | trim %}
6561

62+
{% endif %}
63+
{% if kasm_blurb is defined %}
64+
{% include "README_SNIPPETS/KASM.j2" | trim %}
65+
6666
{% endif %}
6767
{% endif %}
6868
{% include "README_SNIPPETS/USAGE.j2" | trim %}

‎roles/generate-jenkins/templates/README_SNIPPETS/KASM.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To install cjk fonts on startup as an example pass the environment variables (Al
5151

5252
The web interface has the option for "IME Input Mode" in Settings which will allow non english characters to be used from a non en_US keyboard on the client. Once enabled it will perform the same as a local Linux installation set to your locale.
5353

54-
### DRI3 GPU Acceleration
54+
### DRI3 GPU Acceleration (KasmVNC interface)
5555

5656
For accelerated apps or games, render devices can be mounted into the container and leveraged by applications using:
5757

@@ -68,7 +68,7 @@ This feature only supports **Open Source** GPU drivers:
6868
The `DRINODE` environment variable can be used to point to a specific GPU.
6969
Up to date information can be found [here](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html)
7070

71-
{% if show_nvidia is defined %}### Nvidia GPU Support
71+
{% if show_nvidia is defined %}### Nvidia GPU Support (KasmVNC interface)
7272

7373
**Nvidia support is not compatible with Alpine based images as Alpine lacks Nvidia drivers**
7474

0 commit comments

Comments
 (0)