diff --git a/build.sh b/build.sh index d866949..7c2d214 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,7 @@ ${DOCKER} run --rm \ -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}.LICENSE:/home/build/cri-dockerd.license:ro" \ -v "${PWD}/sshd.pam:/home/build/sshd.pam:ro" \ $(env | grep ^LIMA_ | xargs -n 1 printf -- '-e %s ') \ + -e "LIMA_INSTALL_CGROUP_CONF=${LIMA_INSTALL_CGROUP_CONF}" \ -e "LIMA_REPO_VERSION=${REPO_VERSION}" \ -e "LIMA_BUILD_ID=${BUILD_ID}" \ -e "LIMA_VARIANT_ID=${EDITION}" \ diff --git a/edition/std b/edition/std index 325154b..8cce5fb 100644 --- a/edition/std +++ b/edition/std @@ -10,3 +10,5 @@ LIMA_INSTALL_LOGROTATE=true LIMA_INSTALL_OPENSSH_SFTP_SERVER=true LIMA_INSTALL_SSHFS=true LIMA_INSTALL_TINI=true + +LIMA_INSTALL_CGROUP_CONF=true diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh index b1b325c..52e55c7 100755 --- a/genapkovl-lima.sh +++ b/genapkovl-lima.sh @@ -293,6 +293,11 @@ if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then cp /home/build/cri-dockerd.license "${tmp}/usr/share/doc/cri-dockerd/LICENSE" fi +if [ "${LIMA_INSTALL_CGROUP_CONF}" == "true" ]; then + mkdir -p "${tmp}/etc/conf.d" + echo 'rc_cgroup_mode=${LIMA_ALPINE_CGROUP_MODE:-hybrid}' >> ${tmp}/etc/conf.d/cgroups +fi + mkdir -p "${tmp}/etc" mkdir -p "${tmp}/proc" mkdir -p "${tmp}/usr"