GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

USTREAMER_MIN_VERSION

Browse Source
This commit is contained in:
Devaev Maxim
2019-07-15 03:28:19 +03:00
parent 46e4f89b56
commit 7b98777ed0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -5,9 +5,7 @@ TESTENV_HID ?= /dev/ttyS10
TESTENV_VIDEO ?= /dev/video0 TESTENV_VIDEO ?= /dev/video0
TESTENV_LOOP ?= /dev/loop7 TESTENV_LOOP ?= /dev/loop7
USTREAMER_VERSION = $(shell curl --silent "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=ustreamer" \ USTREAMER_MIN_VERSION ?= 1.1
| grep "^pkgver=" \
| grep -Po "\d+\.\d+[^\"']*")
# ===== # =====
@@ -36,7 +34,7 @@ testenv:
$(if $(NC),--no-cache,) \ $(if $(NC),--no-cache,) \
--rm \ --rm \
--tag $(TESTENV_IMAGE) \ --tag $(TESTENV_IMAGE) \
--build-arg USTREAMER_VERSION=$(USTREAMER_VERSION) \ --build-arg USTREAMER_MIN_VERSION=$(USTREAMER_MIN_VERSION) \
-f testenv/Dockerfile . -f testenv/Dockerfile .

6
testenv/Dockerfile
View File

@@ -32,9 +32,9 @@ RUN pkg-install -S \
htmlhint \ htmlhint \
eslint eslint
ARG USTREAMER_VERSION ARG USTREAMER_MIN_VERSION
ENV USTREAMER_VERSION $USTREAMER_VERSION ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION
RUN echo $USTREAMER_VERSION RUN echo $USTREAMER_MIN_VERSION
RUN pkg-install -S ustreamer RUN pkg-install -S ustreamer
COPY testenv/requirements.txt requirements.txt COPY testenv/requirements.txt requirements.txt