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

Merge pull request #12560 from G-M0N3Y-2503/feature_docker-ce_update

Browse source 
docker-ce: Updated to 19.03.11, updated relevant dependencies and script simplification
This commit is contained in:
Florian Eckert 2020-06-22 13:28:32 +02:00 committed by GitHub
commit 3031fb3670
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 117 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/cgroupfs-mount/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cgroupfs-mount PKG_NAME:=cgroupfs-mount
PKG_VERSION:=1.4 PKG_VERSION:=1.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tianon/cgroupfs-mount/tar.gz/${PKG_VERSION}? PKG_SOURCE_URL:=https://codeload.github.com/tianon/cgroupfs-mount/tar.gz/${PKG_VERSION}?
@ -12,11 +12,19 @@ PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/cgroupfs-mount/config
config CGROUPFS_MOUNT_KERNEL_CGROUPS
bool "Enable kernel cgroups support"
depends on PACKAGE_cgroupfs-mount
default y if ( DOCKER_KERNEL_OPTIONS || LXC_KERNEL_OPTIONS )
select KERNEL_CGROUPS
endef
define Package/cgroupfs-mount define Package/cgroupfs-mount
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=cgroup mount scripts TITLE:=cgroup mount scripts
DEPENDS:=@KERNEL_CGROUPS +mount-utils DEPENDS:=+mount-utils
MENU:=1 MENU:=1
endef endef

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

@ -1,6 +1,6 @@
menu "Kernel features for Docker" config DOCKER_KERNEL_OPTIONS
config DOCKER_KERNEL_OPTIONS
bool "Enable Basic kernel support for Docker" bool "Enable Basic kernel support for Docker"
depends on PACKAGE_docker-ce
default n default n
select KERNEL_CGROUPS select KERNEL_CGROUPS
select KERNEL_CGROUP_CPUACCT select KERNEL_CGROUP_CPUACCT
@ -16,8 +16,9 @@ menu "Kernel features for Docker"
cgroups, namespaces and other miscellaneous options. cgroups, namespaces and other miscellaneous options.
see also https://github.com/docker/engine/blob/master/contrib/check-config.sh see also https://github.com/docker/engine/blob/master/contrib/check-config.sh
config DOCKER_SECCOMP config DOCKER_SECCOMP
bool "Enable support for seccomp in Docker" bool "Enable support for seccomp in Docker"
depends on PACKAGE_docker-ce
default n default n
select KERNEL_SECCOMP select KERNEL_SECCOMP
select PACKAGE_libseccomp select PACKAGE_libseccomp
@ -25,8 +26,9 @@ menu "Kernel features for Docker"
Build Docker with support for seccomp filters. Build Docker with support for seccomp filters.
Select libseccomp which also pulls-in the needed kernel features. Select libseccomp which also pulls-in the needed kernel features.
config DOCKER_RES_SHAPE config DOCKER_RES_SHAPE
bool "Enables support for resource shaping" bool "Enables support for resource shaping"
depends on PACKAGE_docker-ce
default n default n
select KERNEL_MEMCG_SWAP select KERNEL_MEMCG_SWAP
select KERNEL_MEMCG_SWAP_ENABLED select KERNEL_MEMCG_SWAP_ENABLED
@ -37,7 +39,9 @@ menu "Kernel features for Docker"
select KERNEL_CFS_BANDWIDTH select KERNEL_CFS_BANDWIDTH
select KERNEL_RT_GROUP_SCHED select KERNEL_RT_GROUP_SCHED
menu "Network" menu "Network"
depends on PACKAGE_docker-ce
config DOCKER_NET_OVERLAY config DOCKER_NET_OVERLAY
bool "Enables the Overlay network feature" bool "Enables the Overlay network feature"
default n default n
@ -68,9 +72,11 @@ menu "Kernel features for Docker"
default n default n
select PACKAGE_kmod-nf-nathelper select PACKAGE_kmod-nf-nathelper
select PACKAGE_kmod-nf-nathelper-extra select PACKAGE_kmod-nf-nathelper-extra
endmenu endmenu
menu "Storage"
depends on PACKAGE_docker-ce
menu "Storage"
config DOCKER_STO_EXT4 config DOCKER_STO_EXT4
bool "Enables support for ext3 or ext4 as the backing filesystem" bool "Enables support for ext3 or ext4 as the backing filesystem"
default n default n
@ -81,5 +87,4 @@ menu "Kernel features for Docker"
default n default n
select PACKAGE_kmod-fs-btrfs select PACKAGE_kmod-fs-btrfs
select KERNEL_BTRFS_FS_POSIX_ACL select KERNEL_BTRFS_FS_POSIX_ACL
endmenu
endmenu endmenu

37
utils/docker-ce/Makefile
View file

@ -1,32 +1,31 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=docker-ce PKG_NAME:=docker-ce
PKG_VERSION:=19.03.9 PKG_VERSION:=19.03.11
PKG_RELEASE:=1 PKG_RELEASE:=1
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:=f1b9e28e789516b4ba741cc4683c2c088e8c4893e2acbd7ac272a75ddeccc1a1 PKG_HASH:=5821b189056d64ca7961c4c93cfa60c1805d0fbe4a1ea2d57ff2122b3dc61ea1
PKG_SOURCE_VERSION:=9d988398e7 # SHA1 used within the docker executables PKG_SOURCE_VERSION:=42e35e61f3 # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
define CheckExpectedSrcVer # $(1) = path to dependent package 'Makefile'
$(eval SRC_VER:=$(shell grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' $(1))) # $(2) = relevant docker-ce '.installer' file
$(if $(subst $(2),,$(SRC_VER)), \ define EnsureVendoredVersion
$(error ERROR: Expected $(1) source version '$(2)', found '$(SRC_VER)'), \ ( \
$(info OK: Expected $(1) source version '$(2)', found '$(SRC_VER)') \ DEP_VER=$$$$( grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' "$(1)" ); \
VEN_VER=$$$$( grep --only-matching --perl-regexp '(?<=_COMMIT:=)(.*)(?=})' "$(PKG_BUILD_DIR)/components/engine/hack/dockerfile/install/$(2)" ); \
if [ $$$$VEN_VER != $$$$DEP_VER ]; then \
echo "ERROR: Expected 'PKG_SOURCE_VERSION:=$$$$VEN_VER' in '$(1)', found 'PKG_SOURCE_VERSION:=$$$$DEP_VER'"; \
exit 1; \
fi \
) )
endef endef
# values from respective '.installer' files at https://github.com/docker/docker-ce/blob/v$(PKG_VERSION)/components/engine/hack/dockerfile/install/
$(eval $(call CheckExpectedSrcVer,../containerd/Makefile,7ad184331fa3e55e52b890ea95e65ba581ae3429))
$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,0941c3f409260d5f05cfa6fc68420d8ad45ee483))
$(eval $(call CheckExpectedSrcVer,../runc/Makefile,dc9208a3303feef5b3839f4323d9beb36df0a9dd))
$(eval $(call CheckExpectedSrcVer,../tini/Makefile,fec3683b971d9c3ef73f284f176672c44b448662))
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -55,6 +54,16 @@ define Package/docker-ce/description
to run anywhere consistently on any infrastructure. to run anywhere consistently on any infrastructure.
endef endef
define Build/Prepare
$(Build/Prepare/Default)
# Verify dependencies are the vendored version
$(call EnsureVendoredVersion,../containerd/Makefile,containerd.installer)
$(call EnsureVendoredVersion,../libnetwork/Makefile,proxy.installer)
$(call EnsureVendoredVersion,../runc/Makefile,runc.installer)
$(call EnsureVendoredVersion,../tini/Makefile,tini.installer)
endef
define Build/Configure define Build/Configure
# move so GoPackage/Build/Configure will get the correct path # move so GoPackage/Build/Configure will get the correct path
mv $(PKG_BUILD_DIR)/components/engine $(PKG_BUILD_DIR)/ mv $(PKG_BUILD_DIR)/components/engine $(PKG_BUILD_DIR)/

6
utils/libnetwork/Makefile
View file

@ -12,9 +12,9 @@ GO_PKG_BUILD_PKG:= \
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://$(GO_PKG) PKG_SOURCE_URL:=https://$(GO_PKG)
PKG_SOURCE_VERSION:=0941c3f409260d5f05cfa6fc68420d8ad45ee483 PKG_SOURCE_VERSION:=153d0769a1181bf591a9637fd487a541ec7db1e6
PKG_SOURCE_DATE:=2020-03-19 PKG_SOURCE_DATE:=2020-04-04
PKG_MIRROR_HASH:=678e1d3175fd78833fddd38965baa3784993dbf53c3f56f5f7d39364eeaf93e1 PKG_MIRROR_HASH:=72d540bd6a3681dbc6eb4d271beb57d030b501c2e4bca33e82b6027a3e523ac6
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>