diff options
| author | Devaev Maxim <[email protected]> | 2018-09-28 05:06:23 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-09-28 06:13:38 +0300 |
| commit | 054f8e44dbc49a458d22a1d8d5a588a9a831761c (patch) | |
| tree | 2d67b1ac32b4e8a43e69bd6d2c5bf6ab1fda787f /testenv | |
| parent | 8fd196bde84c1b396f54cd670e2767d1ed4068ee (diff) | |
some fixes for ustreamer
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/Dockerfile | 7 | ||||
| -rw-r--r-- | testenv/customizepkg.nginx | 1 | ||||
| -rw-r--r-- | testenv/kvmd.yaml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index db7e6538..6a16cf77 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -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 diff --git a/testenv/customizepkg.nginx b/testenv/customizepkg.nginx new file mode 100644 index 00000000..5e7db5a4 --- /dev/null +++ b/testenv/customizepkg.nginx @@ -0,0 +1 @@ +replace#global#_nginxver=.*#_nginxver=`pacman -Q nginx-mainline | grep -Po "\\d+\\.\\d+\\.\\d+"` diff --git a/testenv/kvmd.yaml b/testenv/kvmd.yaml index a94dcb2b..4b1a05cc 100644 --- a/testenv/kvmd.yaml +++ b/testenv/kvmd.yaml @@ -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" |