diff --git a/entrypoint.sh b/entrypoint.sh index dacef38..a4581c6 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,7 +4,15 @@ set -ex # Caluclate Memory Limit from cgroups/maxmemory MEMSIZE=$(grep MemTotal /proc/meminfo | awk '{print $2 * 1024}') -MEMLIMIT=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes) + +if [ -f "/sys/fs/cgroup/memory/memory.limit_in_bytes" ]; then + MEMLIMIT=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes) +elif [ -f "/sys/fs/cgroup/memory.max" ] + MEMLIMIT=$(cat /sys/fs/cgroup/memory.max) +else + MEMLIMIT=$(grep MemTotal /proc/meminfo | awk '{print $2 * 1024}') +fi + MEMLIMIT=$((MEMLIMIT