From c438a2bfd38ed7136f7a0c808fe6fdfff600d23b Mon Sep 17 00:00:00 2001 From: Chuck Moyes Date: Mon, 2 Sep 2019 21:46:38 -0700 Subject: [PATCH 1/7] update docker --- packages/addons/service/docker/package.mk | 4 +-- ...er-100.01-use-addon-storage-location.patch | 27 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 278e5cafb5..a291e98354 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_VERSION="18.09.8" -PKG_SHA256="33dfaf3cf296f8e9011ec6ed2de0125dfeaf8a938126f0218b0218a156c14014" +PKG_VERSION="19.03.1" +PKG_SHA256="dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053" PKG_REV="127" PKG_ARCH="any" PKG_LICENSE="ASL" diff --git a/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch b/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch index 782eca21c5..059fc8606b 100644 --- a/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch +++ b/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch @@ -47,27 +47,18 @@ index 832fdb95a4..606ddfaf96 100644 // If registry is insecure and HTTPS failed, fallback to HTTP. diff --git a/components/engine/cmd/dockerd/daemon_unix.go b/components/engine/cmd/dockerd/daemon_unix.go -index 7b03e28594..74fc0cfe24 100644 +index a6685bb..f39da58 100644 --- a/components/engine/cmd/dockerd/daemon_unix.go +++ b/components/engine/cmd/dockerd/daemon_unix.go -@@ -19,7 +19,7 @@ import ( - "golang.org/x/sys/unix" - ) +@@ -26,7 +26,7 @@ import ( --const defaultDaemonConfigFile = "/etc/docker/daemon.json" -+const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json" - - // setDefaultUmask sets the umask to 0022 to avoid problems - // caused by custom umask -@@ -34,7 +34,7 @@ func setDefaultUmask() error { - } - - func getDaemonConfDir(_ string) string { -- return "/etc/docker" -+ return "/storage/.kodi/userdata/addon_data/service.system.docker/config" - } - - func (cli *DaemonCli) getPlatformContainerdDaemonOpts() ([]supervisor.DaemonOpt, error) { + func getDefaultDaemonConfigDir() (string, error) { + if !honorXDG { +- return "/etc/docker", nil ++ return "/storage/.kodi/userdata/addon_data/service.system.docker/config", nil + } + // NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because + diff --git a/components/engine/daemon/config/config_test.go b/components/engine/daemon/config/config_test.go index 6998ed3312..c255b62146 100644 --- a/components/engine/daemon/config/config_test.go From 54e4607d36170cf98dd2bdf927889d53f3441ff8 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Tue, 3 Sep 2019 22:23:57 +0200 Subject: [PATCH 2/7] docker: updated to 19.03.2 / fixed displayed versions / bump PKG_REV to 128 --- packages/addons/service/docker/changelog.txt | 3 +++ packages/addons/service/docker/package.mk | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt index 096b3058fa..c41bf86623 100644 --- a/packages/addons/service/docker/changelog.txt +++ b/packages/addons/service/docker/changelog.txt @@ -1,3 +1,6 @@ +128 +- Update to docker 19.03.2 + 127 - Update to docker 18.09.8 diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index a291e98354..5c9049a844 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_VERSION="19.03.1" -PKG_SHA256="dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053" -PKG_REV="127" +PKG_VERSION="19.03.2" +PKG_SHA256="46b52f92cb258e038e3f29624e75a52e4d2f91502f56edeac0f0b2661b3b9c3d" +PKG_REV="128" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" @@ -16,6 +16,9 @@ PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of 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." PKG_TOOLCHAIN="manual" +# Git commit of the matching release https://github.com/docker/docker-ce/releases +export PKG_GIT_COMMIT="6a30dfca03664a0b6bf0646a7d389ee7d0318e6e" + PKG_IS_ADDON="yes" PKG_ADDON_NAME="Docker" PKG_ADDON_TYPE="xbmc.service" @@ -103,7 +106,7 @@ configure_target() { fi # used for docker version - export GITCOMMIT=${PKG_VERSION} + export GITCOMMIT=${PKG_GIT_COMMIT} export VERSION=${PKG_VERSION} export BUILDTIME="$(date --utc)" @@ -114,9 +117,9 @@ configure_target() { make_target() { mkdir -p bin - PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli.Version=${VERSION}'" - PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli.GitCommit=${GITCOMMIT}'" - PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli.BuildTime=${BUILDTIME}'" + PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'" + PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'" + PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'" ${GOLANG} build -v -o bin/docker -a -tags "${DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./components/cli/cmd/docker ${GOLANG} build -v -o bin/dockerd -a -tags "${DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS}" ./components/engine/cmd/dockerd } From b35224fb38b89473bec15078984c4fc5bce11c75 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Tue, 3 Sep 2019 12:15:33 +0200 Subject: [PATCH 3/7] containerd: updated to v1.2.8 / fixed displayed git commit --- packages/addons/addon-depends/containerd/package.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk index e134e8b747..77b0808f79 100644 --- a/packages/addons/addon-depends/containerd/package.mk +++ b/packages/addons/addon-depends/containerd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.2.7" -PKG_SHA256="7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801" +PKG_VERSION="1.2.8" +PKG_SHA256="6165ae2ad669d9ec6d317492d30a1511365bd31ad29efae757f19c1828bf75b3" PKG_LICENSE="APL" PKG_SITE="https://containerd.tools/" PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz" @@ -12,6 +12,9 @@ PKG_DEPENDS_TARGET="toolchain go:host" PKG_LONGDESC="A daemon to control runC, built for performance and density." PKG_TOOLCHAIN="manual" +# Git commit of the matching release https://github.com/containerd/containerd/releases +PKG_GIT_COMMIT="a4bc1d432a2c33aa2eed37f338dceabb93641310" + pre_make_target() { case ${TARGET_ARCH} in x86_64) @@ -38,8 +41,8 @@ pre_make_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=${CFLAGS} - export CONTAINERD_VERSION=v${PKG_VERSION} - export CONTAINERD_REVISION=${PKG_VERSION} + export CONTAINERD_VERSION=${PKG_VERSION} + export CONTAINERD_REVISION=${PKG_GIT_COMMIT} 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 GOLANG=${TOOLCHAIN}/lib/golang/bin/go From 82447e2e31513c109279b15aebf9aa09e6ea36b5 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Tue, 3 Sep 2019 10:26:51 +0200 Subject: [PATCH 4/7] go: updated to v1.12.9 --- packages/addons/addon-depends/go/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 6999bc18d8..2e5c973570 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.12.7" -PKG_SHA256="a27a971bf88c9684b3ed19b7b30765b1318bad375e9bb528abe3528010b5b433" +PKG_VERSION="1.12.9" +PKG_SHA256="c31433aa0bb01856c812d40a91336e25cbce2e50800eb9fe88a7adf0305f1a5b" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" From 14c69d33d099c0b4a4625d42075baf4c1f4a7224 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Tue, 3 Sep 2019 10:27:05 +0200 Subject: [PATCH 5/7] libnetwork: updated to git fc5a7d9 --- packages/addons/addon-depends/libnetwork/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk index 4b72301235..3404319168 100644 --- a/packages/addons/addon-depends/libnetwork/package.mk +++ b/packages/addons/addon-depends/libnetwork/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libnetwork" -PKG_VERSION="e7933d41e7b206756115aa9df5e0599fc5169742" -PKG_SHA256="b9695c4d7711487543b2eff8ca74cc2deb9828f7f4582196324d39d20eab3855" +PKG_VERSION="fc5a7d91d54cc98f64fc28f9e288b46a0bee756c" +PKG_SHA256="42f34cd6d27d3e656fd87e73c9c7eef0c2b7e88825553b458c89be23668212ea" PKG_LICENSE="APL" PKG_SITE="https://github.com/docker/libnetwork" PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz" From 638c6d7d21d135ece44d576dfb37c1c19300e5ec Mon Sep 17 00:00:00 2001 From: 5schatten Date: Tue, 3 Sep 2019 11:10:10 +0200 Subject: [PATCH 6/7] runc: fixed displayed git commit --- packages/addons/addon-depends/runc/package.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 077b64777d..9f8f531d9d 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -3,15 +3,18 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="runc" -PKG_VERSION="v1.0.0-rc8" +PKG_VERSION="1.0.0-rc8" PKG_SHA256="efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" -PKG_URL="https://github.com/opencontainers/runc/archive/${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain go:host" PKG_LONGDESC="A CLI tool for spawning and running containers according to the OCI specification." PKG_TOOLCHAIN="manual" +# Git commit of the matching release https://github.com/opencontainers/runc/releases +PKG_GIT_COMMIT="425e105d5a03fabd737a126ad93d62a9eeede87f" + pre_make_target() { case $TARGET_ARCH in x86_64) @@ -38,7 +41,7 @@ pre_make_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -X main.version=$(cat ./VERSION) -extld $CC" + export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go export GOPATH=$PKG_BUILD/.gopath export GOROOT=$TOOLCHAIN/lib/golang From 91a7f8bd0d5fc9b554e5d04788935f48605655c0 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Wed, 4 Sep 2019 12:10:01 +0200 Subject: [PATCH 7/7] docker: added patch to fix too many arguments in call to filesync.CopyFileWriter - reverts https://github.com/docker/docker-ce/commit/1fbc98bc6a3c732f999d98cd73d86b3a3a97039c#diff-4493cae342788d4a8f2bdbce1a2d69fc --- ...rguments-in-call-to-filesync.CopyFileWriter.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/addons/service/docker/patches/docker-100.02-fix-too-many-arguments-in-call-to-filesync.CopyFileWriter.patch diff --git a/packages/addons/service/docker/patches/docker-100.02-fix-too-many-arguments-in-call-to-filesync.CopyFileWriter.patch b/packages/addons/service/docker/patches/docker-100.02-fix-too-many-arguments-in-call-to-filesync.CopyFileWriter.patch new file mode 100644 index 0000000000..0ae2380d66 --- /dev/null +++ b/packages/addons/service/docker/patches/docker-100.02-fix-too-many-arguments-in-call-to-filesync.CopyFileWriter.patch @@ -0,0 +1,12 @@ +--- a/components/engine/vendor/github.com/moby/buildkit/exporter/tar/export.go ++++ b/components/engine/vendor/github.com/moby/buildkit/exporter/tar/export.go +@@ -147,7 +147,7 @@ + fs = d.FS + } + +- w, err := filesync.CopyFileWriter(ctx, nil, e.caller) ++ w, err := filesync.CopyFileWriter(ctx, e.caller) + if err != nil { + return nil, err + } +