Skip to content

Commit 049e390

Browse files
authored
Merge pull request #292 from linuxserver/monthly
2 parents 4acfc6e + f52b5a4 commit 049e390

File tree

10 files changed

+161
-25
lines changed

10 files changed

+161
-25
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ docker build \
105105
-t linuxserver/jenkins-builder:latest .
106106
```
107107

108-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
108+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
109109

110110
```bash
111-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
112112
```
113113

114114
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ docker build \
3232
-t lscr.io/linuxserver/jenkins-builder:latest .
3333
```
3434

35-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
35+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
3636

3737
```bash
38-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
38+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
3939
```
4040

4141
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

readme-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ full_custom_readme: |
3535
-t lscr.io/linuxserver/jenkins-builder:latest .
3636
```
3737
38-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
38+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
3939
4040
```bash
41-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
41+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
4242
```
4343
4444
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

roles/generate-jenkins/templates/CONTRIBUTING.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ docker build \
105105
-t {{ lsio_project_name_short }}/{{ project_name }}:latest .
106106
```
107107

108-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
108+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
109109

110110
```bash
111-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
112112
```
113113

114114
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

roles/generate-jenkins/templates/DOCUMENTATION.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ 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 %}
3640
{% if readonly_supported is defined and readonly_supported %}
3741
{% include "README_SNIPPETS/READONLY.j2" | trim %}
3842

roles/generate-jenkins/templates/Jenkinsfile.j2

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,31 +1157,31 @@ pipeline {
11571157
"target_commitish": "{{ ls_branch }}",\
11581158
"name": "'${META_TAG}'",\
11591159
{% if custom_version_command is defined %}
1160-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1160+
"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
11611161
{% endif %}
11621162
{% if external_type == "github_devel" %}
1163-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1163+
"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
11641164
{% elif external_type == "github_stable" %}
1165-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1165+
"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
11661166
{% elif external_type == "alpine_repo" %}
1167-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
1167+
"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
11681168
{% elif external_type == "custom_json" %}
1169-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1169+
"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
11701170
{% elif external_type == "deb_repo" %}
1171-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Repo Changes:**\\n\\n' > start
1171+
"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
11721172
{% elif external_type == "external_blob" %}
1173-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
1173+
"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
11741174
{% elif external_type == "github_commit" %}
1175-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
1175+
"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
11761176
{% elif external_type == "gitlab_commit" %}
1177-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_GITLAB_PROJ}' Changes:**\\n\\n' > start
1177+
"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
11781178
{% elif external_type == "npm_version" %}
1179-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**NPM Changes:**\\n\\n' > start
1179+
"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
11801180
{% elif external_type == "os" %}
1181-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start
1181+
"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
11821182
{% elif external_type == "pip_version" %}
1183-
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start
1184-
{% elif external_type == "custom" %} "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Custom Changes:**\\n\\n' > start{% endif %}
1183+
"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
1184+
{% 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 %}
11851185
printf '","draft": false,"prerelease": {% if release_type == "stable" %}false{% elif release_type == "prerelease" %}true{% endif %}}' >> releasebody.json
11861186
paste -d'\\0' start releasebody.json > releasebody.json.done
11871187
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/PACKAGE_TRIGGER_SCHEDULER.j2

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ jobs:
7070
if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
7171
if [[ -n "${triggered_branches}" ]]; then
7272
NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
73+
NOTIFY_BUILD_URL="**Build URL:** {{ lsio_ci_url }}/blue/organizations/jenkins/Docker-Pipeline-Builders%2F{{ project_repo_name }}/activity/ \n"
74+
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
7375
fi
7476
if [[ -n "${skipped_branches}" ]]; then
7577
NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
7678
fi
77-
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
7879
echo "**** Notifying Discord ****"
7980
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
80-
"description": "**Package Check Build(s) Triggered for {{ project_name }}** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"{{ lsio_ci_url }}/blue/organizations/jenkins/Docker-Pipeline-Builders%2F{{ project_repo_name }}/activity/"' \n"}],
81+
"description": "**Package Check Build(s) for {{ project_name }}** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
8182
"username": "Github Actions"}' ${{ '{{' }} secrets.DISCORD_WEBHOOK {{ '}}' }}
8283
fi

roles/generate-jenkins/templates/README.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
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 %}
3539
{% if readonly_supported is defined and readonly_supported %}
3640
{% include "README_SNIPPETS/READONLY.j2" | trim %}
3741

roles/generate-jenkins/templates/README_SNIPPETS/BUILDING_LOCALLY.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ docker build \
1111
-t lscr.io/{{ lsio_project_name_short }}/{{ project_name }}:{{ release_tag }} .
1212
```
1313

14-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
14+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
1515

1616
```bash
17-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
17+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
1818
```
1919

2020
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
**Modern GUI desktop apps have issues with the latest Docker and syscall compatibility, you can use Docker with the `--security-opt seccomp=unconfined` setting to allow these syscalls on hosts with older Kernels or libseccomp**
2+
3+
### Security
4+
5+
{{ "Do not put this on the Internet if you do not know what you are doing." | admonition(flavour=markdown, severity="warning") }}
6+
7+
By default this container has no authentication and the optional environment variables `CUSTOM_USER` and `PASSWORD` to enable basic http auth via the embedded NGINX server should only be used to locally secure the container from unwanted access on a local network. If exposing this to the Internet we recommend putting it behind a reverse proxy, such as [SWAG](https://github.com/linuxserver/docker-swag), and ensuring a secure authentication solution is in place. From the web interface a terminal can be launched and it is configured for passwordless sudo, so anyone with access to it can install and run whatever they want along with probing your local network.
8+
9+
### Options in all KasmVNC based GUI containers
10+
11+
This container is based on [Docker Baseimage KasmVNC](https://github.com/linuxserver/docker-baseimage-kasmvnc) which means there are additional environment variables and run configurations to enable or disable specific functionality.
12+
13+
#### Optional environment variables
14+
15+
| Variable | Description |
16+
| :----: | --- |
17+
| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default {% if external_http_port is defined %}{{ external_http_port }}{% else %}3000{% endif %}. |
18+
| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default {% if external_https_port is defined %}{{ external_https_port }}{% else %}3001{% endif %}. |
19+
| CUSTOM_USER | HTTP Basic auth username, abc is default. |
20+
| PASSWORD | HTTP Basic auth password, abc is default. If unset there will be no auth |
21+
| SUBFOLDER | Subfolder for the application if running a subfolder reverse proxy, need both slashes IE `/subfolder/` |
22+
| TITLE | The page title displayed on the web browser, default "KasmVNC Client". |
23+
| FM_HOME | This is the home directory (landing) for the file manager, default "/config". |
24+
| START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. |
25+
| DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use IE `/dev/dri/renderD128` |
26+
| DISABLE_IPV6 | If set to true or any value this will disable IPv6 |
27+
| LC_ALL | Set the Language for the container to run as IE `fr_FR.UTF-8` `ar_AE.UTF-8` |
28+
| NO_DECOR | If set the application will run without window borders in openbox for use as a PWA. |
29+
| NO_FULL | Do not autmatically fullscreen applications when using openbox. |
30+
31+
#### Optional run configurations
32+
33+
| Variable | Description |
34+
| :----: | --- |
35+
| `--privileged` | Will start a Docker in Docker (DinD) setup inside the container to use docker in an isolated environment. For increased performance mount the Docker directory inside the container to the host IE `-v /home/user/docker-data:/var/lib/docker`. |
36+
| `-v /var/run/docker.sock:/var/run/docker.sock` | Mount in the host level Docker socket to either interact with it via CLI or use Docker enabled applications. |
37+
| `--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) |
38+
39+
### Language Support - Internationalization
40+
41+
The environment variable `LC_ALL` can be used to start this container in a different language than English simply pass for example to launch the Desktop session in French `LC_ALL=fr_FR.UTF-8`. Some languages like Chinese, Japanese, or Korean will be missing fonts needed to render properly known as cjk fonts, but others may exist and not be installed inside the container depending on what underlying distribution you are running. We only ensure fonts for Latin characters are present. Fonts can be installed with a mod on startup.
42+
43+
To install cjk fonts on startup as an example pass the environment variables (Alpine base):
44+
45+
```
46+
-e DOCKER_MODS=linuxserver/mods:universal-package-install
47+
-e INSTALL_PACKAGES={% if noto_fonts is defined %}{{ noto_fonts }}{% else %}font-noto-cjk{% endif %}
48+
-e LC_ALL=zh_CN.UTF-8
49+
```
50+
51+
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.
52+
53+
### DRI3 GPU Acceleration
54+
55+
For accelerated apps or games, render devices can be mounted into the container and leveraged by applications using:
56+
57+
`--device /dev/dri:/dev/dri`
58+
59+
This feature only supports **Open Source** GPU drivers:
60+
61+
| Driver | Description |
62+
| :----: | --- |
63+
| Intel | i965 and i915 drivers for Intel iGPU chipsets |
64+
| AMD | AMDGPU, Radeon, and ATI drivers for AMD dedicated or APU chipsets |
65+
| NVIDIA | nouveau2 drivers only, closed source NVIDIA drivers lack DRI3 support |
66+
67+
The `DRINODE` environment variable can be used to point to a specific GPU.
68+
Up to date information can be found [here](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html)
69+
70+
{% if show_nvidia is defined %}### Nvidia GPU Support
71+
72+
**Nvidia support is not compatible with Alpine based images as Alpine lacks Nvidia drivers**
73+
74+
Nvidia support is available by leveraging Zink for OpenGL support. This can be enabled with the following run flags:
75+
76+
| Variable | Description |
77+
| :----: | --- |
78+
| --gpus all | This can be filtered down but for most setups this will pass the one Nvidia GPU on the system |
79+
| --runtime nvidia | Specify the Nvidia runtime which mounts drivers and tools in from the host |
80+
81+
The compose syntax is slightly different for this as you will need to set nvidia as the default runtime:
82+
83+
```
84+
sudo nvidia-ctk runtime configure --runtime=docker --set-as-default
85+
sudo service docker restart
86+
```
87+
88+
And to assign the GPU in compose:
89+
90+
```
91+
services:
92+
{{ project_name }}:
93+
image: lscr.io/{{ lsio_project_name_short }}/{{ project_name }}:{{ release_tag }}
94+
deploy:
95+
resources:
96+
reservations:
97+
devices:
98+
- driver: nvidia
99+
count: 1
100+
capabilities: [compute,video,graphics,utility]
101+
```
102+
103+
{% endif %}### Application management
104+
105+
#### PRoot Apps
106+
107+
If you run system native installations of software IE `sudo apt-get install filezilla` and then upgrade or destroy/re-create the container that software will be removed and the container will be at a clean state. For some users that will be acceptable and they can update their system packages as well using system native commands like `apt-get upgrade`. If you want Docker to handle upgrading the container and retain your applications and settings we have created [proot-apps](https://github.com/linuxserver/proot-apps) which allow portable applications to be installed to persistent storage in the user's `$HOME` directory and they will work in a confined Docker environment out of the box. These applications and their settings will persist upgrades of the base container and can be mounted into different flavors of KasmVNC based containers on the fly. This can be achieved from the command line with:
108+
109+
```
110+
proot-apps install filezilla
111+
```
112+
113+
PRoot Apps is included in all KasmVNC based containers, a list of linuxserver.io supported applications is located [HERE](https://github.com/linuxserver/proot-apps?tab=readme-ov-file#supported-apps).
114+
115+
#### Native Apps
116+
117+
It is possible to install extra packages during container start using [universal-package-install](https://github.com/linuxserver/docker-mods/tree/universal-package-install). It might increase starting time significantly. PRoot is preferred.
118+
119+
```yaml
120+
environment:
121+
- DOCKER_MODS=linuxserver/mods:universal-package-install
122+
- INSTALL_PACKAGES=libfuse2|git|gdb
123+
```
124+
125+
### Lossless mode
126+
127+
This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on {% if external_https_port is defined %}{{ external_https_port }}{% else %}3001{% endif %} needs to be used. If using a reverse proxy to port {% if external_http_port is defined %}{{ external_http_port }}{% else %}3000{% endif %} specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless).

0 commit comments

Comments
 (0)