Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docker-ce: Updated to 19.03.2

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

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
This commit is contained in:
Gerard Ryan 2019-10-04 21:48:43 +10:00
parent eed49dad9c
commit c8e70c9550
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
utils/docker-ce/Config.in
View file

@ -31,6 +31,7 @@ menu "Kernel features for Docker"
select KERNEL_MEMCG_SWAP select KERNEL_MEMCG_SWAP
select KERNEL_MEMCG_SWAP_ENABLED select KERNEL_MEMCG_SWAP_ENABLED
select KERNEL_BLK_DEV_THROTTLING select KERNEL_BLK_DEV_THROTTLING
select KERNEL_CFQ_GROUP_IOSCHED
select KERNEL_CGROUP_PERF select KERNEL_CGROUP_PERF
select KERNEL_FAIR_GROUP_SCHED select KERNEL_FAIR_GROUP_SCHED
select KERNEL_CFS_BANDWIDTH select KERNEL_CFS_BANDWIDTH

8
utils/docker-ce/Makefile
View file

@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=docker-ce PKG_NAME:=docker-ce
PKG_VERSION:=19.03.1 PKG_VERSION:=19.03.2
PKG_RELEASE:=2 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053 PKG_HASH:=46b52f92cb258e038e3f29624e75a52e4d2f91502f56edeac0f0b2661b3b9c3d
PKG_SOURCE_VERSION:=74b1e89e8a PKG_SOURCE_VERSION:=6a30dfca03
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
@ -45,7 +45,7 @@ define Package/docker-ce
TITLE:=Docker Community Edition TITLE:=Docker Community Edition
URL:=https://www.docker.com/ URL:=https://www.docker.com/
DEPENDS:=$(GO_ARCH_DEPENDS) @TARGET_x86_64 +btrfs-progs +ca-certificates +cgroupfs-mount +containerd +libdevmapper +libnetwork +tini \ 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 USERID:=docker:docker
MENU:=1 MENU:=1
endef endef

3
utils/docker-ce/files/daemon.json
View file

@ -1,3 +1,4 @@
{ {
"data-root": "/opt/docker/" "data-root": "/opt/docker/",
"log-level": "warn"
} }

1
utils/docker-ce/files/dockerd.init
View file

@ -7,6 +7,7 @@ start_service() {
local nofile=$(cat /proc/sys/fs/nr_open) local nofile=$(cat /proc/sys/fs/nr_open)
procd_open_instance procd_open_instance
procd_set_param stderr 1
procd_set_param command /usr/bin/dockerd procd_set_param command /usr/bin/dockerd
procd_set_param limits nofile="${nofile} ${nofile}" procd_set_param limits nofile="${nofile} ${nofile}"
procd_close_instance procd_close_instance