Skip to content

Commit 293b5d0

Browse files
Merge branch 'master' into release/docker-2.0.0
2 parents ffda4f5 + b483021 commit 293b5d0

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* [Debugging](#Debugging)
1313
* [Clean up](#Clean-up)
1414
* [Image Tag](#Image-Tag)
15+
* [Container Runtime Detection](#container-runtime-detection)
1516
* [Known Issues and Limitations](#Known-Issues-and-Limitations)
1617

1718
# Introduction
@@ -1014,10 +1015,33 @@ It will pull the latest image and can cross patch, minor or major release number
10141015

10151016
**Note: The 'latest' images should not be used in production**
10161017

1018+
# Container Runtime Detection
10171019

1020+
Starting with version 11.2, MarkLogic is able to detect which container runtime the container is running in.
10181021

1022+
## Docker Engine
10191023

1024+
When running on Docker Engine the following entry will show up in the ErrorLogs.txt:
10201025

1026+
`2024-03-15 08:27:36.136 Info: MarkLogic Server is running in a container using Docker runtime. A maximum of <x> huge pages will be used if available.`
1027+
1028+
Where is calculated as described in the [Configuring HugePages](https://github.com/marklogic/marklogic-docker/pull/configuring-hugepages) section.
1029+
1030+
## Containerd Engine
1031+
1032+
When running on Containerd Engine the following entry will show up in the ErrorLogs.txt:
1033+
1034+
`2024-03-15 08:27:36.136 Info: MarkLogic Server is running in a container using Containerd runtime. A maximum of <x> huge pages will be used if available.`
1035+
1036+
Where is calculated as described in the [Configuring HugePages](https://github.com/marklogic/marklogic-docker/pull/configuring-hugepages) section.
1037+
1038+
## CRI-O Engine
1039+
1040+
When running on CRI-O Engine the following entry will show up in the ErrorLogs.txt:
1041+
1042+
`2024-03-15 08:27:36.136 Info: MarkLogic Server is running in a container using CRI-O runtime. A maximum of <x> huge pages will be used if available.`
1043+
1044+
Where is calculated as described in the [Configuring HugePages](https://github.com/marklogic/marklogic-docker/pull/configuring-hugepages) section.
10211045

10221046
# Known Issues and Limitations
10231047

0 commit comments

Comments
 (0)