docker-ce: Updated to 19.03.2

* Added warning logging
* Added missing default kmod
* Added missing kernel feature for IO scheduling

Signed-off-by: Gerard Ryan <redacted>

diff --git a/utils/docker-ce/Config.in b/utils/docker-ce/Config.in
index b67076efd7363c6a42d0796214d9e7b4c2fa2c5e..dba32c45ab845e38b0fae858aea192889bd06094 100644 (file)
--- a/utils/docker-ce/Config.in
+++ b/utils/docker-ce/Config.in
@@ -31,6 +31,7 @@ menu "Kernel features for Docker"
                select KERNEL_MEMCG_SWAP
                select KERNEL_MEMCG_SWAP_ENABLED
                select KERNEL_BLK_DEV_THROTTLING
+               select KERNEL_CFQ_GROUP_IOSCHED
                select KERNEL_CGROUP_PERF
                select KERNEL_FAIR_GROUP_SCHED
                select KERNEL_CFS_BANDWIDTH

diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile
index 19f16462b79bd639868943e4a23832295ad97eaf..b46a5d6f876b0f9d7dcc201e5032bb13b2813e27 100644 (file)
--- a/utils/docker-ce/Makefile
+++ b/utils/docker-ce/Makefile
@@ -1,15 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker-ce
-PKG_VERSION:=19.03.1
+PKG_VERSION:=19.03.2
 PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053
-PKG_SOURCE_VERSION:=74b1e89e8a
+PKG_HASH:=46b52f92cb258e038e3f29624e75a52e4d2f91502f56edeac0f0b2661b3b9c3d
+PKG_SOURCE_VERSION:=6a30dfca03
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 
@@ -45,7 +45,7 @@ define Package/docker-ce
   TITLE:=Docker Community Edition
   URL:=https://www.docker.com/
   DEPENDS:=$(GO_ARCH_DEPENDS) @TARGET_x86_64 +btrfs-progs +ca-certificates +cgroupfs-mount +containerd +libdevmapper +libnetwork +tini \
-           +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-ipvs +kmod-veth
+           +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs +kmod-veth
   USERID:=docker:docker
   MENU:=1
 endef

diff --git a/utils/docker-ce/files/daemon.json b/utils/docker-ce/files/daemon.json
index 4084c23a07d4760d385319494a26656199e3ae23..53c03211fa91f7285061aee95513e498e718e806 100644 (file)
--- a/utils/docker-ce/files/daemon.json
+++ b/utils/docker-ce/files/daemon.json
@@ -1,3 +1,4 @@
 {
-    "data-root": "/opt/docker/"
+    "data-root": "/opt/docker/",
+    "log-level": "warn"
 }

diff --git a/utils/docker-ce/files/dockerd.init b/utils/docker-ce/files/dockerd.init
index 6faea9f74450c2c0e83602a81678a3a4dc26fe79..5fc327ff63406a6b68633d8560739db009c96be8 100644 (file)
--- a/utils/docker-ce/files/dockerd.init
+++ b/utils/docker-ce/files/dockerd.init
@@ -5,8 +5,9 @@ START=25
 
 start_service() {
        local nofile=$(cat /proc/sys/fs/nr_open)
-       
+
        procd_open_instance
+       procd_set_param stderr 1
        procd_set_param command /usr/bin/dockerd
        procd_set_param limits nofile="${nofile} ${nofile}"
        procd_close_instance