From e2654b7154a3e1e1b24af986d6b753818cf2f983 Mon Sep 17 00:00:00 2001 From: Gilbert Bishop-White Date: Thu, 27 May 2021 08:29:32 +0100 Subject: [PATCH] docs: Add instructions for Apple Silicon Macs. --- docs/development/setup-vagrant.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/development/setup-vagrant.md b/docs/development/setup-vagrant.md index 43f4087255..8591b8f99a 100644 --- a/docs/development/setup-vagrant.md +++ b/docs/development/setup-vagrant.md @@ -80,6 +80,8 @@ Jump to: #### macOS +##### Intel + 1. Install [Vagrant][vagrant-dl] (latest). 2. Install [VirtualBox][vbox-dl] (latest). @@ -90,6 +92,12 @@ a provider for Vagrant.) Now you are ready for [Step 2: Get Zulip code](#step-2-get-zulip-code). +##### Apple Silicon + +The setup for Apple Silicon (e.g. M1) Macs is very similar to that [for Intel +above](#intel), except that VirtualBox is not supported. Instead you can use [Docker for +Mac](https://docs.docker.com/docker-for-mac/install/). + #### Ubuntu ##### 1. Install Vagrant, Docker, and Git @@ -277,12 +285,12 @@ Change into the zulip directory and tell vagrant to start the Zulip development environment with `vagrant up`: ``` -# On Windows or macOS: +# On Windows or macOS (Intel): cd zulip vagrant plugin install vagrant-vbguest vagrant up --provider=virtualbox -# On Linux: +# On Linux or macOS (Apple Silicon): cd zulip vagrant up --provider=docker ```