diff --git a/Dockerfile b/Dockerfile index 3f784f0a1a..64b46ab81d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:trusty +EXPOSE 9991 + RUN apt-get update && apt-get install -y \ python-pbs \ wget @@ -15,9 +17,3 @@ RUN ln -nsf /srv/zulip ~/zulip RUN echo 'export LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"' >> ~zulip/.bashrc WORKDIR /srv/zulip - -CMD ["/srv/zulip/tools/provision.py", "--docker"] -CMD ["source /srv/zulip-venv/bin/activate"] -CMD ["./srv/zulip/tools/start-dockers"] - -EXPOSE 9991 diff --git a/docs/install-docker-dev.md b/docs/install-docker-dev.md index c297770787..728a77cf9c 100644 --- a/docs/install-docker-dev.md +++ b/docs/install-docker-dev.md @@ -26,8 +26,11 @@ go to the directory with the Zulip source code: docker build -t user/zulipdev . ``` + Commit and tag the provisioned images. The below will install Zulip's dependencies: ``` +docker run -itv $(pwd):/srv/zulip -p 9991:9991 user/zulipdev /bin/bash +$ /usr/bin/python /srv/zulip/tools/provision.py --docker docker ps -af ancestor=user/zulipdev docker commit -m "Zulip installed" user/zulipdev:v2 ``` @@ -46,6 +49,7 @@ to understand how to use the Zulip development. Note that container; you can then visit http://localhost:9991 to connect to your new Zulip Docker container. + To view the container's `run-dev.py` console logs to get important debugging information (and e.g. outgoing emails) printed by the Zulip development environment, you can use: