jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #589 from lrusak/docker

Browse Source 
docker: include docker-proxy
This commit is contained in:
Christian Hewitt 2016-07-31 22:35:12 +04:00 committed by GitHub
commit e36a73e71e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/service/docker/changelog.txt
View File

@ -1,3 +1,6 @@
8.0.106
- Include missing docker-proxy
8.0.105
- Update to docker 1.12.0
- Update to golang 1.6.3

4
packages/addons/service/docker/package.mk
View File

@ -18,7 +18,7 @@
PKG_NAME="docker"
PKG_VERSION="1.12.0"
PKG_REV="105"
PKG_REV="106"
PKG_ARCH="any"
PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6"
PKG_LICENSE="ASL"
@ -84,6 +84,7 @@ make_target() {
mkdir -p bin
$GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/docker
$GOLANG build -v -o bin/dockerd -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/dockerd
$GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./vendor/src/github.com/docker/libnetwork/cmd/proxy
}
makeinstall_target() {
@ -94,6 +95,7 @@ addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $ROOT/$PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $ROOT/$PKG_BUILD/bin/docker-proxy $ADDON_BUILD/$PKG_ADDON_ID/bin
# containerd
cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd