USTREAMER_MIN_VERSION

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

View File

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

View File

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