Merge pull request #7751 from heitbaum/docker12

[le12] docker: update to 23.0.4 and addon (3)

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="cli"
 PKG_VERSION="$(get_pkg_version moby)"
-PKG_SHA256="bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d"
+PKG_SHA256="477c37f128db7bb6926dc410f337cb525af4f26ea9719d38dc2978460dbe2de8"
 PKG_LICENSE="ASL"
 PKG_SITE="https://github.com/docker/cli"
 PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI"
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/docker/cli/releases
-export PKG_GIT_COMMIT="569dd73db13099a7c3104d73aa15117b359045bc"
+export PKG_GIT_COMMIT="f480fb1e374b16c8a1419e84f465f2562456145e"
 
 configure_target() {
   go_configure

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

@@ -19,9 +19,9 @@ pre_make_target() {
 
   go_configure
 
-  export CONTAINERD_VERSION=${PKG_VERSION}
+  export CONTAINERD_VERSION="${PKG_VERSION}"
-  export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
+  export CONTAINERD_REVISION="${PKG_GIT_COMMIT}"
-  export CONTAINERD_PKG=github.com/containerd/containerd
+  export CONTAINERD_PKG="github.com/containerd/containerd"
   export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
   export GO111MODULE=off
 

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

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="ctop"
+PKG_VERSION="0.7.7"
+PKG_SHA256="0db439f2030af73ad5345884b08a33a762c3b41b30604223dd0ebddde72d2741"
+PKG_LICENSE="MIT"
+PKG_SITE="https://ctop.sh"
+PKG_URL="https://github.com/bcicen/ctop/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_LONGDESC="Top-like interface for container metrics"
+PKG_TOOLCHAIN="manual"
+
+# Git commit of the matching release https://github.com/bcicen/ctop/releases
+PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
+
+pre_make_target() {
+  go_configure
+
+  export CTOP_VERSION="${PKG_VERSION}"
+  export CTOP_REVISION="${PKG_GIT_COMMIT}"
+  export CTOP_PKG="github.com/bcicen/ctop"
+  export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}"
+
+  mkdir -p ${GOPATH}/src/github.com/bcicen
+  ln -fs ${PKG_BUILD} ${GOPATH}/src/${CTOP_PKG}
+}
+
+make_target() {
+  mkdir -p bin
+  ${GOLANG} build -v -o bin/ctop -a -tags "static_build release" -ldflags "${LDFLAGS}"
+}

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="moby"
-PKG_VERSION="23.0.2"
+PKG_VERSION="23.0.4"
-PKG_SHA256="4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39"
+PKG_SHA256="6c6e965974335595eaccb17ccec927aebbc10d44b1a95262871b16c0be4c0179"
 PKG_LICENSE="ASL"
 PKG_SITE="https://mobyproject.org/"
 PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/moby/moby
-export PKG_GIT_COMMIT="219f21bf07502b447095649b5a2764661737f164"
+export PKG_GIT_COMMIT="cbce3319305c39df3405c969a12e0a5d2bad3f4f"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \

packages/addons/service/docker/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
-PKG_DEPENDS_TARGET="cli containerd moby runc tini"
+PKG_DEPENDS_TARGET="cli containerd ctop 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."
@@ -32,6 +32,9 @@ addon() {
     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
 
+    # ctop
+    cp -P $(get_build_dir ctop)/bin/ctop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ctop
+
     # runc
     cp -P $(get_build_dir runc)/bin/runc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/runc