--- old/src/hotspot/share/prims/whitebox.cpp	2019-10-31 15:27:47.636659001 +0100
+++ new/src/hotspot/share/prims/whitebox.cpp	2019-10-31 15:27:47.319658531 +0100
@@ -2130,6 +2130,20 @@
   return false;
 WB_END
 
+WB_ENTRY(jobject, WB_ContainerType(JNIEnv* env, jobject o))
+  jstring cg_type = NULL;
+#ifdef LINUX
+#ifndef PRODUCT
+  const char* p = OSContainer::container_type();
+  ThreadToNativeFromVM ttn(thread);
+  cg_type = env->NewStringUTF(p);
+
+  CHECK_JNI_EXCEPTION_(env, NULL);
+#endif
+#endif
+  return cg_type;
+WB_END
+
 WB_ENTRY(void, WB_PrintOsInfo(JNIEnv* env, jobject o))
   os::print_os_info(tty);
 WB_END
@@ -2390,6 +2404,8 @@
                                                       (void*)&WB_CheckLibSpecifiesNoexecstack},
   {CC"isContainerized",           CC"()Z",            (void*)&WB_IsContainerized },
   {CC"printOsInfo",               CC"()V",            (void*)&WB_PrintOsInfo },
+  {CC"containerType",             CC"()Ljava/lang/String;",
+                                                      (void*)&WB_ContainerType },
   {CC"disableElfSectionCache",    CC"()V",            (void*)&WB_DisableElfSectionCache },
   {CC"resolvedMethodItemsCount",  CC"()J",            (void*)&WB_ResolvedMethodItemsCount },
   {CC"protectionDomainRemovedCount",   CC"()I",       (void*)&WB_ProtectionDomainRemovedCount },