Skip to content

Commit e535c96

Browse files
committed
Upgrade development environment to Ubuntu 22.04.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent bedbaa3 commit e535c96

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Vagrant.configure("2") do |config|
1515
ubuntu_mirror = ""
1616
vboxadd_version = nil
1717

18-
config.vm.box = "bento/ubuntu-20.04"
18+
config.vm.box = "bento/ubuntu-22.04"
1919

2020
config.vm.synced_folder ".", "/vagrant", disabled: true
2121
config.vm.synced_folder ".", "/srv/zulip", docker_consistency: "z"

docs/development/setup/vagrant-ssh.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ vagrant ssh
88
You should see output that starts like this:
99

1010
```console
11-
Welcome to Ubuntu 20.04.4 LTS (GNU/Linux 5.4.0-107-generic x86_64)
11+
Welcome to Ubuntu 22.04.3 LTS (GNU/Linux 5.15.0-92-generic x86_64)
1212
```
1313

1414
Congrats, you're now inside the Zulip development environment!

docs/development/setup/vagrant-up.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The first time you run this command it will take some time because Vagrant
22
does the following:
33

4-
- downloads the base Ubuntu 20.04 virtual machine/Docker image
4+
- downloads the base Ubuntu 22.04 virtual machine/Docker image
55
- configures this virtual machine/container for use with Zulip,
66
- creates a shared directory mapping your clone of the Zulip code inside the
77
virtual machine/container at `~/zulip`

tools/droplets/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ so they are notified.
130130
- Check "Monitoring", "IPv6", and "User data"
131131
- Paste the contents of `tools/droplets/new-droplet-image` into the
132132
text box which says `Enter user data here...`
133-
- Name it e.g. `base-ubuntu-20-04.zulipdev.org`
133+
- Name it e.g. `base-ubuntu-22-04.zulipdev.org`
134134
1. Add an A record for `base.zulipdev.org` to point to the new host.
135135
1. Wait for the host to boot.
136136
1. `scp tools/droplets/new-droplet-image base.zulipdev.org:/tmp/new-droplet-image`

tools/setup/dev-vagrant-docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
ARG UBUNTU_MIRROR
44

tools/setup/vagrant-provision

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ set -o pipefail
1212

1313
# Set the MOTD on the system to have Zulip instructions
1414
sudo ln -nsf /srv/zulip/tools/setup/dev-motd /etc/update-motd.d/99-zulip-dev
15-
sudo rm -f /etc/update-motd.d/10-help-text
16-
sudo dpkg --purge landscape-client landscape-common ubuntu-release-upgrader-core update-manager-core update-notifier-common ubuntu-server
15+
sudo rm -f /etc/update-motd.d/10-help-text /etc/update-motd.d/99-bento
16+
sudo dpkg --purge landscape-common
1717
sudo dpkg-divert --add --rename /etc/default/motd-news
1818
sudo sh -c 'echo ENABLED=0 > /etc/default/motd-news'
1919

0 commit comments

Comments
 (0)