Merge pull request #6834 from heitbaum/docker

[le11] docker: update addon to (138)

packages/addons/addon-depends/docker/containerd/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="1.6.6"
-PKG_SHA256="27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24"
+PKG_VERSION="1.6.8"
+PKG_SHA256="f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.io"
 PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/docker/libnetwork/package.mk

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libnetwork"
-PKG_VERSION="339b972b464ee3d401b5788b2af9e31d09d6b7da" # 2022-03-16
-PKG_SHA256="335851e924078a8e274f0c27cb80aaba32d0c1059068740496f1eb31b55a6ec4"
-PKG_LICENSE="APL"
-PKG_SITE="https://github.com/docker/libnetwork"
-PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain go:host"
-PKG_LONGDESC="A native Go implementation for connecting containers."
-PKG_TOOLCHAIN="manual"
-
-pre_make_target() {
-  go_configure
-
-  export CGO_ENABLED=0
-  export LDFLAGS="-extld ${CC}"
-  export GO111MODULE=off
-
-  mkdir -p ${GOPATH}
-  if [ -d ${PKG_BUILD}/vendor ]; then
-    mv ${PKG_BUILD}/vendor ${GOPATH}/src
-  fi
-
-  ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/docker/libnetwork
-}
-
-make_target() {
-  mkdir -p bin
-  ${GOLANG} build -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/proxy
-}

packages/addons/addon-depends/docker/moby/package.mk

@@ -45,6 +45,7 @@ EOF
 
 make_target() {
   mkdir -p bin
+  ${GOLANG} build -mod=mod -modfile=vendor.mod -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/docker-proxy
   ${GOLANG} build -mod=mod -modfile=vendor.mod -v -o bin/dockerd -a -tags "${PKG_MOBY_BUILDTAGS}" -ldflags "${LDFLAGS}" ./cmd/dockerd
 }
 

packages/addons/addon-depends/docker/runc/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="runc"
-PKG_VERSION="1.1.3"
-PKG_SHA256="fc1c70e095d662e38a5889bc6de41857762ce022caaf8be2852663198c533a63"
+PKG_VERSION="1.1.4"
+PKG_SHA256="4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/opencontainers/runc"
 PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz"

packages/addons/service/docker/changelog.txt

@@ -1,3 +1,9 @@
+138
+- libnetwork: drop package
+  docker-proxy is now included in moby
+- containerd: update to 1.6.8
+- runc: update to 1.1.4
+
 137
 - containerd: update to 1.6.6
 - runc: update to 1.1.3

packages/addons/service/docker/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
-PKG_REV="137"
+PKG_REV="138"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
-PKG_DEPENDS_TARGET="containerd runc libnetwork tini moby cli"
+PKG_DEPENDS_TARGET="cli containerd moby runc tini"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
 PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above."
@@ -25,15 +25,13 @@ addon() {
 
     # moby
     cp -P $(get_build_dir moby)/bin/dockerd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -P $(get_build_dir moby)/bin/docker-proxy ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/docker-proxy
 
     # containerd
     cp -P $(get_build_dir containerd)/bin/containerd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd
     cp -P $(get_build_dir containerd)/bin/containerd-shim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim
     cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim-runc-v2
 
-    # libnetwork
-    cp -P $(get_build_dir libnetwork)/bin/docker-proxy ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/docker-proxy
-
     # runc
     cp -P $(get_build_dir runc)/bin/runc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/runc