Add new containers to bazelci.py.
diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 3835e48..3d4b845 100755
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -446,64 +446,104 @@
 # working directory.
 PLATFORMS = {
     "centos7": {
-        "name": "CentOS 7, Java 8",
-        "emoji-name": ":centos: 7 (Java 8)",
+        "name": "CentOS 7 (OpenJDK 8, gcc 4.8.5)",
+        "emoji-name": ":centos: 7 (OpenJDK 8, gcc 4.8.5)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["ubuntu1404", "centos7", "linux"],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/centos7-java8",
         "python": "python3.6",
     },
+    "centos7_java11": {
+        "name": "CentOS 7 (OpenJDK 11, gcc 4.8.5)",
+        "emoji-name": ":centos: 7 (OpenJDK 11, gcc 4.8.5)",
+        "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
+        "publish_binary": [],
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/centos7-java11",
+        "python": "python3.6",
+    },
+    "centos7_java11_devtoolset10": {
+        "name": "CentOS 7 (OpenJDK 11, gcc 10.2.1)",
+        "emoji-name": ":centos: 7 (OpenJDK 11, gcc 10.2.1)",
+        "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
+        "publish_binary": [],
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/centos7-java11-devtoolset10",
+        "python": "python3.6",
+    },
     "debian10": {
-        "name": "Debian Buster, OpenJDK 11",
-        "emoji-name": ":debian: Buster (OpenJDK 11)",
+        "name": "Debian 10 Buster (OpenJDK 11, gcc 8.3.0)",
+        "emoji-name": ":debian: 10 Buster (OpenJDK 11, gcc 8.3.0)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": [],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/debian10-java11",
         "python": "python3.7",
     },
+    "debian11": {
+        "name": "Debian 11 Bullseye (OpenJDK 17, gcc 10.2.1)",
+        "emoji-name": ":debian: 11 Buster (OpenJDK 17, gcc 10.2.1)",
+        "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
+        "publish_binary": [],
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/debian11-java17",
+        "python": "python3.9",
+    },
     "ubuntu1604": {
-        "name": "Ubuntu 16.04, OpenJDK 8",
-        "emoji-name": ":ubuntu: 16.04 (OpenJDK 8)",
+        "name": "Ubuntu 16.04 LTS (OpenJDK 8, gcc 5.4.0)",
+        "emoji-name": ":ubuntu: 16.04 LTS (OpenJDK 8, gcc 5.4.0)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["ubuntu1604"],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu1604-java8",
         "python": "python3.6",
     },
     "ubuntu1804": {
-        "name": "Ubuntu 18.04, OpenJDK 11",
-        "emoji-name": ":ubuntu: 18.04 (OpenJDK 11)",
+        "name": "Ubuntu 18.04 LTS (OpenJDK 11, gcc 7.4.0)",
+        "emoji-name": ":ubuntu: 18.04 LTS (OpenJDK 11, gcc 7.4.0)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["ubuntu1804"],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu1804-java11",
         "python": "python3.6",
     },
     "ubuntu2004": {
-        "name": "Ubuntu 20.04, OpenJDK 11",
-        "emoji-name": ":ubuntu: 20.04 (OpenJDK 11)",
+        "name": "Ubuntu 20.04 LTS (OpenJDK 11, gcc 9.3.0)",
+        "emoji-name": ":ubuntu: 20.04 LTS (OpenJDK 11, gcc 9.3.0)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": [],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2004-java11",
         "python": "python3.8",
     },
     "kythe_ubuntu2004": {
-        "name": "Kythe (Ubuntu 20.04, OpenJDK 11)",
-        "emoji-name": "Kythe (:ubuntu: 20.04, OpenJDK 11)",
+        "name": "Kythe (Ubuntu 20.04 LTS, OpenJDK 11, gcc 9.3.0)",
+        "emoji-name": "Kythe (:ubuntu: 20.04 LTS, OpenJDK 11, gcc 9.3.0)",
         "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": [],
         "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2004-java11-kythe",
         "python": "python3.8",
     },
+    "ubuntu2104": {
+        "name": "Ubuntu 21.04 (OpenJDK 11, gcc 10.3.0)",
+        "emoji-name": ":ubuntu: 21.04 (OpenJDK 11, gcc 10.3.0)",
+        "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
+        "publish_binary": [],
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2104-java11",
+        "python": "python3.8",
+    },
+    "ubuntu2110": {
+        "name": "Ubuntu 21.10 (OpenJDK 17, gcc 11.2.0)",
+        "emoji-name": ":ubuntu: 21.10 (OpenJDK 11, gcc 11.2.0)",
+        "downstream-root": "/var/lib/buildkite-agent/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
+        "publish_binary": [],
+        "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2110-java11",
+        "python": "python3.8",
+    },
     "macos": {
-        "name": "macOS, OpenJDK 8",
-        "emoji-name": ":darwin: (OpenJDK 8)",
+        "name": "macOS (OpenJDK 8, Xcode)",
+        "emoji-name": ":darwin: (OpenJDK 8, Xcode)",
         "downstream-root": "/Users/buildkite/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["macos"],
         "queue": "macos",
         "python": "python3",
     },
     "macos_arm64": {
-        "name": "macOS (arm64), OpenJDK 8",
-        "emoji-name": ":darwin: (arm64) (OpenJDK 8)",
+        "name": "macOS arm64 (OpenJDK 8, Xcode)",
+        "emoji-name": ":darwin: arm64 (OpenJDK 8, Xcode)",
         "downstream-root": "/Users/buildkite/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["macos_arm64"],
         # TODO(pcloudy): Switch to macos_arm64 queue when Apple Silicon machines are available,
@@ -512,8 +552,8 @@
         "python": "python3",
     },
     "windows": {
-        "name": "Windows, OpenJDK 8",
-        "emoji-name": ":windows: (OpenJDK 8)",
+        "name": "Windows (OpenJDK 8, VS2017)",
+        "emoji-name": ":windows: (OpenJDK 8, VS2017)",
         "downstream-root": "c:/b/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": ["windows"],
         "queue": "windows",