summaryrefslogtreecommitdiff
path: root/testenv/Dockerfile
diff options
context:
space:
mode:
authorMaxim Devaev <[email protected]>2023-04-20 19:30:16 +0300
committerMaxim Devaev <[email protected]>2023-04-20 19:30:16 +0300
commit314459310aa22615cbd9751c4dd56e1244287a46 (patch)
treeea64eef6ff790ea396d98e2ad8c0390f14ed6340 /testenv/Dockerfile
parent95418c940060fd8c65f1315d06de30ee4bd18558 (diff)
testenv: libgpiod from the repo
Diffstat (limited to 'testenv/Dockerfile')
-rw-r--r--testenv/Dockerfile15
1 files changed, 2 insertions, 13 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile
index 6e07f4e3..452015f8 100644
--- a/testenv/Dockerfile
+++ b/testenv/Dockerfile
@@ -60,6 +60,7 @@ RUN pacman --noconfirm --ask=4 -Syy \
python-hidapi \
python-ldap \
python-zstandard \
+ libgpiod \
freetype2 \
nginx-mainline \
tesseract \
@@ -84,18 +85,6 @@ RUN npm install htmlhint -g \
&& npm install @babel/eslint-parser -g
WORKDIR /
-ARG LIBGPIOD_VERSION
-ENV LIBGPIOD_PKG libgpiod-$LIBGPIOD_VERSION
-RUN curl \
- -o $LIBGPIOD_PKG.tar.gz \
- https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/$LIBGPIOD_PKG.tar.gz \
- && tar -xzvf $LIBGPIOD_PKG.tar.gz \
- && cd $LIBGPIOD_PKG \
- && ./autogen.sh --prefix=/usr --enable-tools=yes --enable-bindings-python \
- && make PREFIX=/usr install \
- && cd - \
- && rm -rf $LIBGPIOD_PKG{,.tar.gz}
-
ARG USTREAMER_MIN_VERSION
ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION
RUN echo $USTREAMER_MIN_VERSION
@@ -107,7 +96,7 @@ RUN git clone https://github.com/pikvm/ustreamer \
RUN mkdir -p \
/etc/kvmd/{nginx,vnc} \
- /var/lib/kvmd/msd/{images,meta} \
+ /var/lib/kvmd/msd \
/var/lib/kvmd/pst/data \
/opt/vc/bin