fix: pin versions so docker can build

A lot of version pinning to ensure Docker builds are working again. Fixes #1304.
SpriteLink · Dec 12, 2022 · 6042e8b · 6042e8b
1 parent 8075b37
commit 6042e8b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd
@@ -48,8 +48,9 @@ RUN apt-get update -qy && apt-get upgrade -qy \
     python-all \
     python-docutils \
     python-pip \
+    python3-pip \
     python-dev \
- && pip --no-input install envtpl \
+ && pip3 --no-input install envtpl \
  && rm -rf /var/lib/apt/lists/*
 
 

diff --git a/Dockerfile.www b/Dockerfile.www
@@ -42,8 +42,9 @@ RUN apt-get update -qy && apt-get upgrade -qy \
     python-all \
     python-docutils \
     python-pip \
+    python3-pip \
     python-dev \
- && pip --no-input install envtpl \
+ && pip3 --no-input install envtpl \
  && rm -rf /var/lib/apt/lists/*
 
 # Install pynipap, nipap and nipap-www

diff --git a/nipap-www/requirements.txt b/nipap-www/requirements.txt
@@ -1,3 +1,11 @@
+# The following requirements are indirect, but needed in order to survive in
+# a world where Python 3 is the default
+decorator<4.0.0
+beautifulsoup4<=4.9.3
+PasteDeploy<3.0.0
+mako<1.2
+waitress<2.0.0
+# End of indirects
 Pylons>=1.0
 Jinja2
 pynipap

diff --git a/nipap/requirements.txt b/nipap/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.1.2
+Flask==1.1.*
 Flask-Compress==1.9.0
 Flask-XML-RPC==0.1.2
 Flask-RESTful==0.3.8