Merge branch 'master' into develop

Dockerfile

@@ -1,40 +1,54 @@
 #####
 # Base docker image for running Evennia-based games in a container.
 #
-# This Dockerfile creates the evennia/evennia docker image
+# Install:
-# on DockerHub, which can be used as the basis for creating
+#   install `docker` (http://docker.com)
-# an Evennia game within a container. This base image can be
-# found in DockerHub at https://hub.docker.com/r/evennia/evennia/
 #
-# For more information on using it to build a container to run your game, see
+# Usage:
+#    cd to a folder where you want your game data to be (or where it already is). 
 #
-# https://github.com/evennia/evennia/wiki/Running%20Evennia%20in%20Docker
+#	docker run -it -p 4000:4000 -p 4001:4001 -p 4005:4005 -v $PWD:/usr/src/game evennia/evennia
 #    
-FROM python:2.7-alpine
+#    (If your OS does not support $PWD, replace it with the full path to your current 
-MAINTAINER Dan Feeney "feend78@gmail.com"
+#    folder).
+#
+#    You will end up in a shell where the `evennia` command is available. From here you
+#    can install and run the game normally. Use Ctrl-D to exit the evennia docker container.
+#
+# The evennia/evennia base image is found on DockerHub and can also be used
+# as a base for creating your own custom containerized Evennia game. For more
+# info, see https://github.com/evennia/evennia/wiki/Running%20Evennia%20in%20Docker .
+#
+FROM alpine
+
+MAINTAINER www.evennia.com
 
 # install compilation environment
-RUN apk update && apk add gcc musl-dev
+RUN apk update && apk add python py-pip python-dev py-setuptools gcc musl-dev jpeg-dev zlib-dev bash
 
 # add the project source
 ADD . /usr/src/evennia
 
 # install dependencies
-RUN pip install -e /usr/src/evennia
+RUN pip install -e /usr/src/evennia --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org
 
-# add the game source during game builds
+# add the game source when rebuilding a new docker image from inside
+# a game dir 
 ONBUILD ADD . /usr/src/game
 
 # make the game source hierarchy persistent with a named volume.
-# during development this is typically superceded by directives in
+# mount on-disk game location here when using the container
-# docker-compose.yml or the CLI to mount a local directory.
+# to just get an evennia environment.
 VOLUME /usr/src/game
 
 # set the working directory
 WORKDIR /usr/src/game
 
-# startup command
+# set bash prompt
-CMD ["evennia", "-i", "start"]
+ENV PS1 "evennia|docker \w $ "
+
+# startup a shell when we start the container
+ENTRYPOINT  ["bash"]
 
 # expose the telnet, webserver and websocket client ports
 EXPOSE 4000 4001 4005

requirements.txt

@@ -1,7 +1,7 @@
 # Evennia dependencies, for Linux/Mac platforms
 
 django > 1.10, < 2.0
-twisted >= 16.0.0
+twisted == 16.0.0
 mock >= 1.0.1
 pillow == 2.9.0
 pytz