diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile index 3ba2c82868..6518dee819 100644 --- a/utils/docker-ce/Makefile +++ b/utils/docker-ce/Makefile @@ -1,18 +1,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker-ce -PKG_VERSION:=18.09.6 +PKG_VERSION:=18.09.8 PKG_RELEASE:=1 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:=e8d2dd41e09e838e9043d4a5cf8433d8860afa20a611025621f7817b7ab16012 -PKG_SOURCE_VERSION:=481bc77156 +PKG_HASH:=33dfaf3cf296f8e9011ec6ed2de0125dfeaf8a938126f0218b0218a156c14014 +PKG_SOURCE_VERSION:=0dd43dd87f PKG_MAINTAINER:=Gerard Ryan +define CheckExpectedSrcVer + $(eval SRC_VER:=$(shell grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' $(1))) + $(if $(subst $(2),,$(SRC_VER)), \ + $(error ERROR: Expected $(1) source version '$(2)', found '$(SRC_VER)'), \ + $(info OK: Expected $(1) source version '$(2)', found '$(SRC_VER)') \ + ) +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,894b81a4b802e4eb2a91d1ce216b8817763c29fb)) +$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,e7933d41e7b206756115aa9df5e0599fc5169742)) +$(eval $(call CheckExpectedSrcVer,../runc/Makefile,425e105d5a03fabd737a126ad93d62a9eeede87f)) +$(eval $(call CheckExpectedSrcVer,../tini/Makefile,fec3683b971d9c3ef73f284f176672c44b448662)) + PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 @@ -30,8 +44,8 @@ define Package/docker-ce CATEGORY:=Utilities TITLE:=Docker Community Edition URL:=https://www.docker.com/ - DEPENDS:=$(GO_ARCH_DEPENDS) @TARGET_x86_64 +btrfs-progs +libdevmapper +containerd +cgroupfs-mount +ca-certificates +iptables-mod-extra +DOCKER_SECCOMP:libseccomp \ - +kmod-ikconfig +kmod-veth +kmod-br-netfilter +kmod-nf-ipvs + 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 USERID:=docker:docker MENU:=1 endef