diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | testenv/Dockerfile | 6 |
2 files changed, 5 insertions, 7 deletions
@@ -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 . diff --git a/testenv/Dockerfile b/testenv/Dockerfile index ba8a71ee..29e573ec 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -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 |