Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.

Commit 35caf34

Browse files
committed
v2.0.2-rc1
* Optimize kernel parameters based on MinIO recommendations * Use Docker 26.1.4 by default
1 parent afce4f9 commit 35caf34

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile.dapper

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ARG SYSTEM_DOCKER_VERSION=17.06.107
8787
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
8888
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
8989

90-
ARG USER_DOCKER_VERSION=24.0.9
90+
ARG USER_DOCKER_VERSION=26.1.4
9191
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
9292

9393
ARG AZURE_SERVICE=false

cmd/control/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
426426
//cloudConfig := SCRIPTS_DIR + "/conf/empty.yml" //${cloudConfig:-"${SCRIPTS_DIR}/conf/empty.yml"}
427427
CONSOLE := "tty0"
428428
baseName := "/mnt/new_img"
429-
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=never scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor panic=10" // console="+CONSOLE
429+
kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait transparent_hugepage=madvise iommu=pt intel_iommu=off scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor panic=10" // console="+CONSOLE
430430
if statedir != "" {
431431
kernelArgs = kernelArgs + " rancher.state.directory=" + statedir
432432
}

scripts/global.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on transparent_hugepage=never scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor ${APPEND}
1+
APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on transparent_hugepage=madvise iommu=pt intel_iommu=off scsi_mod.use_blk_mq=1 apparmor=1 security=apparmor ${APPEND}

0 commit comments

Comments
 (0)