From 8723931236b466ac933b3ca891756b889d59d029 Mon Sep 17 00:00:00 2001
From: Robert Imschweiler <50044286+ro-i@users.noreply.github.com>
Date: Fri, 9 Sep 2022 01:12:59 +0200
Subject: [PATCH] vagrant: Add Fedora 36 support.

- Add documentation for the vagrant setup on Fedora.
- Fix the container setup by adding the `z` option to the bind mounts so
that the selinux context allows sharing. This is according to the official
docker documentation:
https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
https://www.vagrantup.com/docs/providers/docker/basics (section "Volume
Consistency")
---
 Vagrantfile                       |  2 +-
 docs/development/setup-vagrant.md | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index cdaccd2707..befad96798 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,7 +18,7 @@ Vagrant.configure("2") do |config|
   config.vm.box = "bento/ubuntu-20.04"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder ".", "/srv/zulip"
+  config.vm.synced_folder ".", "/srv/zulip", docker_consistency: "z"
 
   vagrant_config_file = ENV["HOME"] + "/.zulip-vagrant-config"
   if File.file?(vagrant_config_file)
diff --git a/docs/development/setup-vagrant.md b/docs/development/setup-vagrant.md
index 17d6c11501..3cfb046d38 100644
--- a/docs/development/setup-vagrant.md
+++ b/docs/development/setup-vagrant.md
@@ -51,13 +51,13 @@ a proxy to access the internet.)
 - **macOS**: macOS (10.11 El Capitan or newer recommended)
 - **Ubuntu LTS**: 20.04 or 22.04
 - **Debian**: 11
+- **Fedora**: tested for 36
 - **Windows**: Windows 64-bit (Win 10 recommended), hardware
   virtualization enabled (VT-x or AMD-V), administrator access.
 
 Other Linux distributions work great too, but we don't maintain
 documentation for installing Vagrant and Docker on those systems, so
-you'll need to find a separate guide and crib from the Debian/Ubuntu
-docs.
+you'll need to find a separate guide and crib from these docs.
 
 ### Step 0: Set up Git & GitHub
 
@@ -77,6 +77,7 @@ Jump to:
 - [macOS](#macos)
 - [Ubuntu](#ubuntu)
 - [Debian](#debian)
+- [Fedora](#fedora)
 - [Windows](#windows-10)
 
 #### macOS
@@ -145,6 +146,16 @@ Now you are ready for [Step 2: Get Zulip code](#step-2-get-zulip-code).
 
 The setup for Debian is the same as that [for Ubuntu above](#ubuntu).
 
+#### Fedora
+
+The setup for Fedora is mostly equivalent to the [setup for Ubuntu](#ubuntu).
+The only difference is the installation of Docker. Fedora does not include the
+official `docker-ce` package (named `docker.io` in the
+[setup for Ubuntu](#ubuntu)) in their repositories. They provide the package
+`moby-engine` which you can choose instead. In case you prefer the official
+docker distribution, you can follow
+[their documentation to install Docker on Fedora](https://docs.docker.com/engine/install/fedora/).
+
 #### Windows 10
 
 :::{note}