Merge pull request #158 from mkuf/add-additional-requirements-to-moon…

…raker moonraker: add additional requirements related to Arksine/moonraker#864
mkuf · May 30, 2024 · f41708e · f41708e
2 parents dceebaa + b06a6cd
commit f41708e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 * docs: note about video device permissions via #155 reported by @d-graz
+* moonraker: additional requirements are installed prior to upstream requirements, fixes https://github.com/Arksine/moonraker/issues/864
 ### Fixed
 ### Changed
 ### Removed

diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile
@@ -1,11 +1,15 @@
 ## Get Code and Build venv
 FROM python:3.12-bookworm as build
 
+WORKDIR /opt
+COPY requirements-prind.txt .
+
+RUN python -m venv venv \
+ && venv/bin/pip install -r requirements-prind.txt
+
 ARG REPO=https://github.com/Arksine/moonraker
 ARG VERSION=master
 
-WORKDIR /opt
-
 RUN git clone ${REPO} moonraker \
  && cd moonraker \
  && git checkout ${VERSION} \

diff --git a/docker/moonraker/requirements-prind.txt b/docker/moonraker/requirements-prind.txt
@@ -0,0 +1,4 @@
+## This file contains additional requirements
+## Packages defined here will be installed prior to klippy requirements
+##
+lmdb==1.4.1