diff options
| -rw-r--r-- | testenv/Dockerfile | 20 | ||||
| -rw-r--r-- | testenv/requirements.txt | 11 |
2 files changed, 15 insertions, 16 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 87ed5f8f..464005db 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -18,10 +18,20 @@ RUN pacman -Syu --noconfirm \ python \ python-pip \ python-tox \ + python-mako \ + python-yaml \ + python-aiohttp \ + python-aiofiles \ + python-passlib \ + python-pyserial \ + python-setproctitle \ + python-psutil \ python-systemd \ python-dbus \ - python-psutil \ - python-mako \ + python-pygments \ + python-pam \ + python-pillow \ + python-xlib \ python-hidapi \ nginx-mainline \ socat \ @@ -29,6 +39,9 @@ RUN pacman -Syu --noconfirm \ npm \ && (pacman -Sc --noconfirm || true) +COPY testenv/requirements.txt requirements.txt +RUN pip install -r requirements.txt + RUN npm install htmlhint -g \ && npm install pug \ && npm install pug-cli -g @@ -54,9 +67,6 @@ RUN git clone https://github.com/pikvm/ustreamer \ && cd - \ && rm -rf ustreamer -COPY testenv/requirements.txt requirements.txt -RUN pip install -r requirements.txt - RUN mkdir -p \ /etc/kvmd/nginx \ /var/lib/kvmd/msd/{images,meta} \ diff --git a/testenv/requirements.txt b/testenv/requirements.txt index c61cac61..bde383b7 100644 --- a/testenv/requirements.txt +++ b/testenv/requirements.txt @@ -1,12 +1 @@ -six -aiohttp -aiofiles -passlib -pyyaml -pyserial -setproctitle -pygments pyghmi -python-pam -Pillow -python-xlib |