From 15a23a24a6590b5433712d58f20d27556ce4a963 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 27 Aug 2022 05:27:50 +0000
Subject: [PATCH] docker: update addon to (138)

- containerd: update to 1.6.8
- libnetwork: drop package
  - docker-proxy is now included in moby
  - since: https://github.com/moby/moby/commit/e7cf711c022fed4f1dc3cb6af1be9987b3bd65ba
- moby: build docker-proxy in addition to dockerd
- runc: update to 1.1.4
---
 packages/addons/service/docker/changelog.txt | 6 ++++++
 packages/addons/service/docker/package.mk    | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt
index 40999a4ed5..883fad734b 100644
--- a/packages/addons/service/docker/changelog.txt
+++ b/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
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 5744af221c..89b2676cc6 100644
--- a/packages/addons/service/docker/package.mk
+++ b/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