2016-11-28 03:05:23 +01:00
|
|
|
# Developing on a remote machine
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
The Zulip developer environment works well on remote virtual machines. This can
|
|
|
|
be a good alternative for those with poor network connectivity or who have
|
|
|
|
limited storage/memory on their local machines.
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
We recommend giving the Zulip development environment its own virtual
|
|
|
|
machine, running Ubuntu 14.04 or
|
|
|
|
16.04, with at least 2GB of memory. If the Zulip development
|
|
|
|
environment will be the only thing running on the remote virtual
|
|
|
|
machine, we recommend installing
|
2016-11-28 03:05:23 +01:00
|
|
|
[directly][install-direct]. Otherwise, we recommend the
|
2016-11-29 23:16:51 +01:00
|
|
|
[Vagrant][install-vagrant] method so you can easily uninstall if you
|
|
|
|
need to.
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
## Connecting to the remote environment
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2017-01-15 05:13:22 +01:00
|
|
|
The best way to connect to your server is using the command line tool `ssh`.
|
2016-11-29 02:52:18 +01:00
|
|
|
|
|
|
|
* On macOS and Linux/UNIX, `ssh` is a part of Terminal.
|
|
|
|
* On Windows, `ssh` comes with [Bash for Git][git-bash].
|
|
|
|
|
|
|
|
Open *Terminal* or *Bash for Git*, and connect with the following:
|
|
|
|
|
|
|
|
```
|
|
|
|
$ ssh username@host
|
|
|
|
```
|
|
|
|
|
|
|
|
If you have poor internet connectivity, we recommend using
|
|
|
|
[Mosh](https://mosh.org/) as it is more reliable over slow or unreliable
|
|
|
|
networks.
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
## Setting up the development environment
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
After you have connected to your remote server, you need to install the
|
|
|
|
development environment.
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
If the Zulip development environment will be the only thing running on
|
|
|
|
the remote virtual machine, we recommend installing
|
|
|
|
[directly][install-direct]. Otherwise, we recommend the
|
|
|
|
[Vagrant][install-vagrant] method so you can easily uninstall if you
|
|
|
|
need to.
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
## Running the development server
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-29 20:13:55 +01:00
|
|
|
Once you have set up the development environment, you can start up the
|
2016-11-29 23:16:51 +01:00
|
|
|
development instance of Zulip with the following command in the directory where
|
|
|
|
you cloned Zulip:
|
2016-11-20 23:09:59 +01:00
|
|
|
|
|
|
|
```
|
2016-11-29 02:52:18 +01:00
|
|
|
./tools/run-dev.py --interface=''
|
2016-11-20 23:09:59 +01:00
|
|
|
```
|
|
|
|
|
2017-05-13 13:18:57 +02:00
|
|
|
This will start up the Zulip server on port 9991. You can then
|
|
|
|
navigate to `http://<REMOTE_IP>:9991` and you should see something like
|
|
|
|
this screenshot of the Zulip development environment:
|
2016-11-29 02:52:18 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
![Image of Zulip development
|
2017-05-13 13:18:57 +02:00
|
|
|
environment](images/zulip-dev.png)
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-29 02:52:18 +01:00
|
|
|
You can [port
|
|
|
|
forward](https://help.ubuntu.com/community/SSH/OpenSSH/PortForwarding) using
|
2016-11-29 23:16:51 +01:00
|
|
|
ssh instead of running the development environment on an exposed interface.
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-29 02:52:18 +01:00
|
|
|
For more information, see [Using the development
|
|
|
|
environment][rtd-using-dev-env].
|
2016-11-20 23:09:59 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
## Making changes to code on your remote development server
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
To see changes on your remote development server, you need to do one of the following:
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 21:27:00 +01:00
|
|
|
* [Edit locally](#editing-locally): Clone Zulip code to your computer and
|
|
|
|
then use your favorite editor to make changes. When you want to see changes
|
2016-11-29 23:16:51 +01:00
|
|
|
on your remote Zulip development instance, sync with Git.
|
2016-11-29 21:27:00 +01:00
|
|
|
* [Edit remotely](#editing-remotely): Edit code directly on your remote
|
2016-11-29 23:16:51 +01:00
|
|
|
Zulip development instance using a [Web-based IDE](#web-based-ide) (recommended for
|
2016-11-29 21:27:00 +01:00
|
|
|
beginners) or a [command line editor](#command-line-editors).
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
#### Editing locally
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 02:52:18 +01:00
|
|
|
If you want to edit code locally install your favorite text editor. If you
|
|
|
|
don't have a favorite, here are some suggestions:
|
|
|
|
|
2016-11-16 20:44:23 +01:00
|
|
|
* [atom](https://atom.io/)
|
|
|
|
* [emacs](https://www.gnu.org/software/emacs/)
|
|
|
|
* [vim](http://www.vim.org/)
|
|
|
|
* [spacemacs](https://github.com/syl20bnr/spacemacs)
|
|
|
|
* [sublime](https://www.sublimetext.com/)
|
|
|
|
|
2016-11-29 02:52:18 +01:00
|
|
|
Next, follow our [Git and GitHub Guide](git-guide.html) to clone and configure
|
|
|
|
your fork of zulip on your local computer.
|
|
|
|
|
|
|
|
Once you have cloned your code locally, you can get to work.
|
|
|
|
|
2016-11-29 21:27:00 +01:00
|
|
|
##### Syncing changes
|
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
The easiest way to see your changes on your remote development server
|
|
|
|
is to **push them to GitHub** and them **fetch and merge** them from
|
|
|
|
the remote server.
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 20:13:55 +01:00
|
|
|
For more detailed instructions about how to do this, see our [Git & GitHub
|
|
|
|
Guide][rtd-git-guide]. In brief, the steps are as follows.
|
|
|
|
|
|
|
|
On your **local computer**:
|
|
|
|
|
|
|
|
1. Open *Terminal* (macOS/Linux) or *Git for BASH*.
|
|
|
|
2. Change directory to where you cloned Zulip (e.g. `cd zulip`).
|
|
|
|
3. Use `git add` and `git commit` to stage and commit your changes (if you
|
|
|
|
haven't already).
|
|
|
|
4. Push your commits to GitHub with `git push origin branchname`.
|
|
|
|
|
|
|
|
Be sure to replace `branchname` with the name of your actual feature branch.
|
|
|
|
|
|
|
|
Once `git push` has completed successfully, you are ready to fetch the commits
|
2016-11-29 23:16:51 +01:00
|
|
|
from your remote development instance:
|
2016-11-29 20:13:55 +01:00
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
1. In *Terminal* or *Git BASH*, connect to your remote development
|
|
|
|
instance with `ssh user@host`.
|
2016-11-29 20:13:55 +01:00
|
|
|
2. Change to the zulip directory (e.g., `cd zulip`).
|
|
|
|
3. Fetch new commits from GitHub with `git fetch origin`.
|
|
|
|
4. Change to the branch you want to work on with `git checkout branchname`.
|
|
|
|
5. Merge the new commits into your branch with `git merge origin/branchname`.
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
#### Editing remotely
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 21:27:00 +01:00
|
|
|
##### Web-based IDE
|
|
|
|
|
|
|
|
If you are relatively new to working on the command line, or just want to get
|
|
|
|
started working quickly, we recommend web-based IDE
|
|
|
|
[Codeanywhere][codeanywhere].
|
|
|
|
|
|
|
|
To setup Codeanywhere for Zulip:
|
|
|
|
|
|
|
|
1. Create a [Codeanywhere][codeanywhere] account and log in.
|
|
|
|
2. Create a new **SFTP-SSH** project. Use *Public key* for authentication.
|
2017-01-15 05:13:22 +01:00
|
|
|
3. Click **GET YOUR PUBLIC KEY** to get the new public key that
|
2016-11-29 21:27:00 +01:00
|
|
|
Codeanywhere generates when you create a new project. Add this public key to
|
2016-11-29 23:16:51 +01:00
|
|
|
`~/.ssh/authorized_keys` on your remote development instance.
|
|
|
|
4. Once you've added the new public key to your remote development instance, click
|
2016-11-29 21:27:00 +01:00
|
|
|
*CONNECT*.
|
|
|
|
|
|
|
|
Now your workspace should look similar this:
|
|
|
|
![Codeanywhere workspace][img-ca-workspace]
|
|
|
|
|
|
|
|
##### Command line editors
|
|
|
|
|
2016-11-29 23:16:51 +01:00
|
|
|
Another way to edit directly on the remote development server is with
|
|
|
|
a command line text editor on the remote machine.
|
2016-11-29 21:27:00 +01:00
|
|
|
|
|
|
|
Two editors often available by default on Linux systems are:
|
|
|
|
|
|
|
|
* **Nano**: A very simple, beginner-friendly editor. However, it lacks a lot of
|
|
|
|
features useful for programming, such as syntax highlighting, so we only
|
|
|
|
recommended it for quick edits to things like configuration files. Launch by
|
|
|
|
running command `nano <filename>`. Exit by pressing *control-X*.
|
|
|
|
|
|
|
|
* **[Vim](http://www.vim.org/)**: A very powerful editor that can take a while
|
|
|
|
to learn. Launch by running `vim <filename>`. Quit Vim by pressing *escape*,
|
|
|
|
typing `:q`, and then pressing *return*. Vim comes with a program to learn it
|
|
|
|
called `vimtutor` (just run that command to start it).
|
|
|
|
|
|
|
|
Other options include:
|
2016-11-29 02:52:18 +01:00
|
|
|
|
2016-11-16 20:44:23 +01:00
|
|
|
* [emacs](https://www.gnu.org/software/emacs/)
|
|
|
|
* [spacemacs](https://github.com/syl20bnr/spacemacs)
|
|
|
|
|
2016-11-28 03:05:23 +01:00
|
|
|
#### Next steps
|
2016-11-16 20:44:23 +01:00
|
|
|
|
2016-11-29 02:52:18 +01:00
|
|
|
Next, read the following to learn more about developing for Zulip:
|
|
|
|
|
|
|
|
* [Git & GitHub Guide][rtd-git-guide]
|
|
|
|
* [Using the Development Environment][rtd-using-dev-env]
|
|
|
|
* [Testing][rtd-testing]
|
2016-11-28 02:50:33 +01:00
|
|
|
|
|
|
|
[install-direct]: dev-setup-non-vagrant.html#installing-directly-on-ubuntu
|
2016-11-28 03:05:23 +01:00
|
|
|
[install-generic]: dev-setup-non-vagrant.html#installing-manually-on-linux
|
|
|
|
[install-vagrant]: dev-env-first-time-contributors.html
|
2016-11-29 02:52:18 +01:00
|
|
|
[rtd-git-guide]: git-guide.html
|
|
|
|
[rtd-using-dev-env]: using-dev-environment.html
|
|
|
|
[rtd-testing]: testing.html
|
|
|
|
[git-bash]: https://git-for-windows.github.io/
|
2016-11-29 21:27:00 +01:00
|
|
|
[codeanywhere]: https://codeanywhere.com/
|
|
|
|
[img-ca-settings]: images/codeanywhere-settings.png
|
|
|
|
[img-ca-workspace]: images/codeanywhere-workspace.png
|