Merge branch 'master' into fix-docker-ps

evennia · Jul 28, 2018 · 7e6fa58 · 7e6fa58
2 parents 78e8420 + 4d2ce10
commit 7e6fa58
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -25,13 +25,14 @@ MAINTAINER www.evennia.com
 
 # install compilation environment
 RUN apk update && apk add python py-pip python-dev py-setuptools gcc \
-musl-dev jpeg-dev zlib-dev bash procps
+musl-dev jpeg-dev zlib-dev bash py2-openssl procps
 
 # add the project source
 ADD . /usr/src/evennia
 
 # install dependencies
 RUN pip install -e /usr/src/evennia --trusted-host pypi.python.org
+RUN pip install cryptography pyasn1 service_identity
 
 # add the game source when rebuilding a new docker image from inside
 # a game dir