mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 22:47:51 +00:00
Merge pull request #3789 from 5schatten/docker_19.03.1
docker: updated to 19.03.2 / bumped dependencies
This commit is contained in:
CvH
GitHub
commit
289d3c0700
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
128
|
||||
- Update to docker 19.03.2
|
||||
|
||||
127
|
||||
- Update to docker 18.09.8
|
||||
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="docker"
|
||||
PKG_VERSION="18.09.8"
|
||||
PKG_SHA256="33dfaf3cf296f8e9011ec6ed2de0125dfeaf8a938126f0218b0218a156c14014"
|
||||
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
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user