aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/stretch/Dockerfile5
-rw-r--r--docker/windowsservercore/Dockerfile4
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/stretch/Dockerfile b/docker/stretch/Dockerfile
index ce34cbff8..27bd668b6 100644
--- a/docker/stretch/Dockerfile
+++ b/docker/stretch/Dockerfile
@@ -25,4 +25,7 @@ RUN ls "$QTDIR" && stat "$QTDIR/lib/libQt5Script.so" && qbs --version
RUN apt-get -y update && apt-get install -y \
g++ \
gcc \
- git
+ git \
+ help2man \
+ python-pip
+RUN pip install beautifulsoup4 lxml # for building the documentation
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile
index bc194d59e..61a363761 100644
--- a/docker/windowsservercore/Dockerfile
+++ b/docker/windowsservercore/Dockerfile
@@ -23,7 +23,11 @@ RUN @powershell -NoProfile -ExecutionPolicy Bypass -Command \
$Env:chocolateyVersion = '0.10.8' ; \
$Env:chocolateyUseWindowsCompression = 'false' ; \
"iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
+RUN choco install -y python2 --version 2.7.14 && refreshenv && python --version && pip --version
RUN choco install -y qbs --version 1.9.1 && qbs --version
RUN choco install -y unzip --version 6.0 && unzip -v
RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 && dir "%PROGRAMFILES(X86)%\Microsoft Visual C++ Build Tools"
RUN choco install -y zip --version 3.0 && zip -v
+
+# for building the documentation
+RUN pip install beautifulsoup4 lxml