From 0018ca54052ea28efea377660761f3661024f854 Mon Sep 17 00:00:00 2001
From: Olli Janatuinen <olli.janatuinen@gmail.com>
Date: Tue, 2 Feb 2021 14:46:25 +0200
Subject: [PATCH] Sync master with v1.9.1 version

- 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
---
 Dockerfile.dapper | 4 ++--
 os-config.tpl.yml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index e12ac851..b3c80b16 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -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} && \
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 1bf9b7ec..5ef4c6f4 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -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