Browse Source

Merge pull request #14435 from neheb/d

docker: update to 20.10.2
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
8d97f89d28
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
  1. +5
    -4
      utils/docker/Makefile
  2. +5
    -4
      utils/dockerd/Makefile

+ 5
- 4
utils/docker/Makefile View File

@ -1,20 +1,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=docker
PKG_VERSION:=20.10.1
PKG_VERSION:=20.10.2
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/docker/cli/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4ee7cc9c3f6287ca834166aaa1a945790c54d9a8345a1b449a193d9c739f2a7d
PKG_SOURCE_VERSION:=562ea3c09c # SHA1 used within the docker executable
PKG_HASH:=a663f54a158c6b2b23b253b14bf0de56ff035750098e760319de1edb7f4ae76d
PKG_SOURCE_VERSION:=2291f61 # SHA1 used within the docker executable
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
GO_PKG:=github.com/docker/cli
@ -26,7 +27,7 @@ define Package/docker
CATEGORY:=Utilities
TITLE:=Docker Community Edition CLI
URL:=https://www.docker.com/
DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64)
DEPENDS:=$(GO_ARCH_DEPENDS)
endef
define Package/docker/description


+ 5
- 4
utils/dockerd/Makefile View File

@ -1,20 +1,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dockerd
PKG_VERSION:=20.10.1
PKG_VERSION:=20.10.2
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/moby/moby/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=f0fda46a82bf8f624eb349370358891d3bc65ef3e320675226f17dba8f62566d
PKG_SOURCE_VERSION:=cdd80e813e # SHA1 used within the docker executables
PKG_HASH:=dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca
PKG_SOURCE_VERSION:=8891c58 # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
GO_PKG:=github.com/docker/docker
@ -30,7 +31,7 @@ define Package/dockerd
CATEGORY:=Utilities
TITLE:=Docker Community Edition Daemon
URL:=https://www.docker.com/
DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +ca-certificates +containerd +libdevmapper +libnetwork +tini \
DEPENDS:=$(GO_ARCH_DEPENDS) +btrfs-progs +ca-certificates +containerd +libdevmapper +libnetwork +tini \
+KERNEL_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs \
+kmod-nf-nat +kmod-veth
USERID:=docker:docker


Loading…
Cancel
Save