Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docker: Revert Docker development to original instructions. 

There were issues with reproducing the Docker build with the latest
docker file and instructions.
This commit is contained in:
Stanley Zheng 2016-11-27 10:31:51 -05:00 committed by Tim Abbott
parent 5c262d3557
commit b162969841
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -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

4
docs/install-docker-dev.md
View File

@ -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" <container id> 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: