Skip to content

Commit

Permalink
docker: Revert Docker development to original instructions.
Browse files Browse the repository at this point in the history
There were issues with reproducing the Docker build with the latest
docker file and instructions.
  • Loading branch information
Stanley Zheng authored and timabbott committed Nov 27, 2016
1 parent 5c262d3 commit b162969
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu:trusty

EXPOSE 9991

RUN apt-get update && apt-get install -y \
python-pbs \
wget
Expand All @@ -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 changes: 4 additions & 0 deletions docs/install-docker-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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:
Expand Down

0 comments on commit b162969

Please sign in to comment.