rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-16 13:57:43 +00:00
Code Issues Releases Wiki Activity

Sync master with v1.9.1 version

Browse Source 
- Bump up default Docker version to 20.10.3
- Use sysctl value fs.inotify.max_user_instances=1024 instead of 128
- Lock dapper to v0.5.4
This commit is contained in:
Olli Janatuinen 2021-02-02 14:46:25 +02:00
parent b31b3fe738
commit 0018ca5405
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.dapper
View File

@ -91,7 +91,7 @@ ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/release
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
ARG SYSTEM_DOCKER_URL_mips64el=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-mips64el-${SYSTEM_DOCKER_VERSION}.tgz
ARG USER_DOCKER_VERSION=20.10.2
ARG USER_DOCKER_VERSION=20.10.3
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
ARG AZURE_SERVICE=false
@ -165,7 +165,7 @@ RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \
chmod +x /usr/bin/docker
# Install dapper
RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \
RUN curl -sL https://releases.rancher.com/dapper/v0.5.4/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \
chmod +x /usr/bin/dapper
RUN cd ${DOWNLOADS} && \

1
os-config.tpl.yml
View File

@ -97,6 +97,7 @@ rancher:
rngd: true
sysctl:
fs.file-max: 1000000000
fs.inotify.max_user_instances: 1024
fs.inotify.max_user_watches: 1048576
net.core.somaxconn: 4096
net.ipv4.tcp_retries2: 5