mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 00:51:53 +08:00
some fixes for ustreamer
This commit is contained in:
@@ -27,14 +27,19 @@ RUN useradd -r -d / packer \
|
||||
&& cd - \
|
||||
&& rm -rf /tmp/packer-color
|
||||
|
||||
COPY testenv/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-ndk
|
||||
COPY testenv/customizepkg.nginx /etc/customizepkg.d/nginx-mainline-mod-lua
|
||||
|
||||
RUN pacman -Syy \
|
||||
&& user-packer -S --noconfirm \
|
||||
customizepkg \
|
||||
&& user-packer -S --noconfirm \
|
||||
python \
|
||||
python-pip \
|
||||
nginx-mainline \
|
||||
nginx-mainline-mod-lua \
|
||||
ustreamer \
|
||||
socat \
|
||||
&& env MAKEPKGOPTS="--skipchecksums --skippgpcheck" user-packer -S --noconfirm nginx-mainline-mod-lua \
|
||||
&& pacman -Sc --noconfirm
|
||||
|
||||
COPY testenv/requirements.txt requirements.txt
|
||||
|
||||
1
testenv/customizepkg.nginx
Normal file
1
testenv/customizepkg.nginx
Normal file
@@ -0,0 +1 @@
|
||||
replace#global#_nginxver=.*#_nginxver=`pacman -Q nginx-mainline | grep -Po "\\d+\\.\\d+\\.\\d+"`
|
||||
@@ -41,7 +41,7 @@ kvmd:
|
||||
cmd:
|
||||
- "/usr/bin/ustreamer"
|
||||
- "--device=/dev/kvmd-streamer"
|
||||
- "--jpeg-quality={quality}"
|
||||
- "--quality={quality}"
|
||||
- "--width=800"
|
||||
- "--height=600"
|
||||
- "--host=0.0.0.0"
|
||||
|
||||
Reference in New Issue
Block a user