diff --git a/thrift/README-short.txt b/thrift/README-short.txt
new file mode 100644
index 000000000000..6365e0c18c73
--- /dev/null
+++ b/thrift/README-short.txt
@@ -0,0 +1 @@
+Apache Thrift compiler: generates cross-language RPC and serialization code from .thrift IDL files
diff --git a/thrift/content.md b/thrift/content.md
new file mode 100644
index 000000000000..3bd701e50fa4
--- /dev/null
+++ b/thrift/content.md
@@ -0,0 +1,35 @@
+# What is Apache Thrift?
+
+Apache Thrift is a software framework for scalable cross-language services development. It combines a software stack with a code generation engine to build services that work efficiently and seamlessly between C++, Java, Python, PHP, Ruby, Erlang, Perl, Haskell, C#, JavaScript, Node.js, Smalltalk, OCaml, Delphi and other languages.
+
+This image contains the Thrift compiler, `thrift`, which generates code from Thrift interface definition (`.thrift`) files. It does not contain the language-specific Thrift libraries; your application gets those through its own build.
+
+> [thrift.apache.org](https://thrift.apache.org/)
+
+# How to use this image
+
+Generate code from the current project directory:
+
+```console
+$ docker run --rm -u "$(id -u):$(id -g)" -v "$PWD:/data" %%IMAGE%% --gen py -o /data /data/service.thrift
+```
+
+The `-u` flag prevents generated files in the bind mount from being owned by root.
+
+Arguments that start with `-` are passed to `thrift`. Any other command runs as given, so `docker run --rm -it %%IMAGE%% sh` opens a shell.
+
+Print the compiler version:
+
+```console
+$ docker run --rm %%IMAGE%% --version
+```
+
+List the generators and their options:
+
+```console
+$ docker run --rm %%IMAGE%% --help
+```
+
+# Versions
+
+The images are built from the voted Apache Thrift source releases. The two latest releases are maintained; older tags stay available but are no longer rebuilt. Tags for 0.12.0 and older come from an earlier, community-maintained image.
diff --git a/thrift/get-help.md b/thrift/get-help.md
new file mode 100644
index 000000000000..d139953cccca
--- /dev/null
+++ b/thrift/get-help.md
@@ -0,0 +1 @@
+[the Apache Thrift mailing lists](https://thrift.apache.org/mailing)
diff --git a/thrift/github-repo b/thrift/github-repo
new file mode 100644
index 000000000000..72464bdf5bf1
--- /dev/null
+++ b/thrift/github-repo
@@ -0,0 +1 @@
+https://github.com/apache/thrift
diff --git a/thrift/issues.md b/thrift/issues.md
new file mode 100644
index 000000000000..6f93076d02de
--- /dev/null
+++ b/thrift/issues.md
@@ -0,0 +1 @@
+[the Apache Thrift JIRA](https://issues.apache.org/jira/projects/THRIFT)
diff --git a/thrift/license.md b/thrift/license.md
new file mode 100644
index 000000000000..2081c81715c1
--- /dev/null
+++ b/thrift/license.md
@@ -0,0 +1,3 @@
+View [license information](https://www.apache.org/licenses/LICENSE-2.0) for the software contained in this image.
+
+Apache, Apache Thrift, and the Apache feather logo are trademarks of The Apache Software Foundation.
diff --git a/thrift/maintainer.md b/thrift/maintainer.md
new file mode 100644
index 000000000000..884a5477afd2
--- /dev/null
+++ b/thrift/maintainer.md
@@ -0,0 +1 @@
+[the Apache Thrift project](%%GITHUB-REPO%%)
diff --git a/thrift/metadata.json b/thrift/metadata.json
new file mode 100644
index 000000000000..67e782480585
--- /dev/null
+++ b/thrift/metadata.json
@@ -0,0 +1,7 @@
+{
+  "hub": {
+    "categories": [
+      "developer-tools"
+    ]
+  }
+}