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

Commit 7ff9ff8

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

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

'

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
pick 6d242cbf v2.0.2-rc1
2+
s 27022f4a Kj
3+
4+
# Rebase afce4f97..27022f4a onto afce4f97 (2 commands)
5+
#
6+
# Commands:
7+
# p, pick <commit> = use commit
8+
# r, reword <commit> = use commit, but edit the commit message
9+
# e, edit <commit> = use commit, but stop for amending
10+
# s, squash <commit> = use commit, but meld into previous commit
11+
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
12+
# commit's log message, unless -C is used, in which case
13+
# keep only this commit's message; -c is same as -C but
14+
# opens the editor
15+
# x, exec <command> = run command (the rest of the line) using shell
16+
# b, break = stop here (continue rebase later with 'git rebase --continue')
17+
# d, drop <commit> = remove commit
18+
# l, label <label> = label current HEAD with a name
19+
# t, reset <label> = reset HEAD to a label
20+
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
21+
# . create a merge commit using the original merge commit's
22+
# . message (or the oneline, if no original merge commit was
23+
# . specified); use -c <commit> to reword the commit message
24+
#
25+
# These lines can be re-ordered; they are executed from top to bottom.
26+
#
27+
# If you remove a line here THAT COMMIT WILL BE LOST.
28+
#
29+
# However, if you remove everything, the rebase will be aborted.
30+
#

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)