Merge branch 'master' of github.com:novaspirit/pi-hosted

This commit is contained in:
Robert Middleswarth 2023-04-14 23:53:31 -04:00
commit 1823a3bf8a
2 changed files with 46 additions and 0 deletions

View file

@ -3703,6 +3703,29 @@
"default": "4011", "default": "4011",
"label": "KASM_PORT", "label": "KASM_PORT",
"name": "KASM_PORT" "name": "KASM_PORT"
<<<<<<< HEAD
=======
},
{
"default": "",
"label": "DOCKER_HUB_USERNAME",
"name": "DOCKER_HUB_USERNAME"
},
{
"default": "",
"label": "DOCKER_HUB_PASSWORD",
"name": "DOCKER_HUB_PASSWORD"
},
{
"default": "",
"label": "MODPROBE_CMD",
"name": "MODPROBE_CMD"
},
{
"default": "",
"label": "OTLP_ENDPOINT",
"name": "OTLP_ENDPOINT"
>>>>>>> a60261a762f8757a6752778edab6b918bb2de4e8
} }
], ],
"image": "lscr.io/linuxserver/kasm:latest", "image": "lscr.io/linuxserver/kasm:latest",

View file

@ -3685,6 +3685,29 @@
"default": "4011", "default": "4011",
"label": "KASM_PORT", "label": "KASM_PORT",
"name": "KASM_PORT" "name": "KASM_PORT"
<<<<<<< HEAD
=======
},
{
"default": "",
"label": "DOCKER_HUB_USERNAME",
"name": "DOCKER_HUB_USERNAME"
},
{
"default": "",
"label": "DOCKER_HUB_PASSWORD",
"name": "DOCKER_HUB_PASSWORD"
},
{
"default": "",
"label": "MODPROBE_CMD",
"name": "MODPROBE_CMD"
},
{
"default": "",
"label": "OTLP_ENDPOINT",
"name": "OTLP_ENDPOINT"
>>>>>>> a60261a762f8757a6752778edab6b918bb2de4e8
} }
], ],
"image": "lscr.io/linuxserver/kasm:latest", "image": "lscr.io/linuxserver/kasm:latest",