From 6a966af5fb6fa0f66571623580c321ee46b2c09e Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Sun, 4 Aug 2024 15:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20v2-hdmiusb-rpi4=20Docker=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E8=BF=90=E8=A1=8C=E6=B8=85=E7=90=86?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=9A=84=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- testenv/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 86d6e8bb..22c0a159 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ LIBGPIOD_VERSION ?= 1.6.3 USTREAMER_MIN_VERSION ?= $(shell grep -o 'ustreamer>=[^"]\+' PKGBUILD | sed 's/ustreamer>=//g') -DEFAULT_PLATFORM ?= v2-hdmi-rpi4 +DEFAULT_PLATFORM ?= v2-hdmiusb-rpi4 DOCKER ?= docker diff --git a/testenv/Dockerfile b/testenv/Dockerfile index b0eed89d..9e50ea99 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -79,7 +79,9 @@ RUN pacman --noconfirm --ask=4 -Syy \ && rm -rf /var/cache/pacman/pkg/* COPY testenv/requirements.txt requirements.txt -RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple && pip install --break-system-packages -r requirements.txt +RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \ + && pip install --break-system-packages -r requirements.txt \ + && pip cache purge # https://stackoverflow.com/questions/57534295 WORKDIR /root @@ -87,7 +89,8 @@ RUN npm config set registry https://registry.npmmirror.com \ && npm install htmlhint -g \ && npm install pug \ && npm install pug-cli -g \ - && npm install @babel/eslint-parser -g + && npm install @babel/eslint-parser -g \ + && npm cache clean -f WORKDIR / ARG USTREAMER_MIN_VERSION