diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 0000000000..0ff88abf94
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,2 @@
+For format details, see https://aka.ms/devcontainer.json
+For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..794b72fd7c
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,22 @@
+{
+	"name": "Sapling",
+	"build": {
+		"context": "..",
+		"dockerfile": "../.github/workflows/sapling-cli-ubuntu-22.04.Dockerfile"
+	},
+	"updateContentCommand": "ln -sf /workspaces/sapling/eden/scm/sl /usr/local/bin/sl",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-azuretools.vscode-docker",
+				"ms-python.python",
+				"rust-lang.rust-analyzer"
+			],
+			"settings": {
+				"rust-analyzer.linkedProjects": [
+					"/workspaces/sapling/eden/scm/Cargo.toml"
+				]
+			}
+		}
+	}
+}
diff --git a/.github/workflows/sapling-cli-ubuntu-20.04.Dockerfile b/.github/workflows/sapling-cli-ubuntu-20.04.Dockerfile
index 8e035b4fb6..c6a6f16bc5 100644
--- a/.github/workflows/sapling-cli-ubuntu-20.04.Dockerfile
+++ b/.github/workflows/sapling-cli-ubuntu-20.04.Dockerfile
@@ -18,7 +18,8 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
 
 # Now we can install the bulk of the packages:
 RUN apt-get -y update
-RUN apt-get -y install nodejs pkg-config libssl-dev cython3 make g++ dpkg-dev python3.8 python3.8-dev python3.8-distutils
+RUN apt-get -y install nodejs pkg-config libssl-dev cython3 make g++ dpkg-dev gettext locales python3.8 python3.8-dev python3.8-distutils
+RUN locale-gen en_US.UTF-8
 
 # Unfortunately, we cannot `apt install cargo` because at the time of this
 # writing, it installs a version of cargo that is too old (1.59). Specifically,
diff --git a/.github/workflows/sapling-cli-ubuntu-22.04.Dockerfile b/.github/workflows/sapling-cli-ubuntu-22.04.Dockerfile
index 559569b26d..12bfddd44f 100644
--- a/.github/workflows/sapling-cli-ubuntu-22.04.Dockerfile
+++ b/.github/workflows/sapling-cli-ubuntu-22.04.Dockerfile
@@ -18,7 +18,8 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
 
 # Now we can install the bulk of the packages:
 RUN apt-get -y update
-RUN apt-get -y install nodejs pkg-config libssl-dev cython3 make g++ dpkg-dev python3.10 python3.10-dev python3.10-distutils
+RUN apt-get -y install nodejs pkg-config libssl-dev cython3 make g++ dpkg-dev gettext locales python3.10 python3.10-dev python3.10-distutils
+RUN locale-gen en_US.UTF-8
 
 # Unfortunately, we cannot `apt install cargo` because at the time of this
 # writing, it installs a version of cargo that is too old (1.59). Specifically,
diff --git a/ci/gen_workflows.py b/ci/gen_workflows.py
index c2856c377a..23dab00e55 100755
--- a/ci/gen_workflows.py
+++ b/ci/gen_workflows.py
@@ -37,6 +37,8 @@ UBUNTU_DEPS = [
     "g++",
     # This is needed for dpkg-name.
     "dpkg-dev",
+    "gettext",
+    "locales",
 ]
 
 MACOS_RELEASES = {
@@ -116,6 +118,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
 # Now we can install the bulk of the packages:
 RUN apt-get -y update
 RUN apt-get -y install {' '.join(full_deps)}
+RUN locale-gen en_US.UTF-8
 
 # Unfortunately, we cannot `apt install cargo` because at the time of this
 # writing, it installs a version of cargo that is too old (1.59). Specifically,