Skip to content
Permalink
Browse files

docker-system: update to 1.12.0

  • Loading branch information...
escalade committed Jul 30, 2016
1 parent 293ffa4 commit ecf4c6e7b709ca9042628af8fa0b62469543739e
@@ -1,2 +1,2 @@
DOCKER_DAEMON_OPTS="--graph=/storage/.docker"
DOCKER_STORAGE_OPTS="--storage-driver=overlay"
DOCKER_STORAGE_OPTS="--storage-driver=overlay2"
@@ -17,7 +17,7 @@
################################################################################

PKG_NAME="docker-system"
PKG_VERSION="1.11.2"
PKG_VERSION="1.12.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_PROJECTS="Generic RPi RPi2"
@@ -79,7 +79,8 @@ configure_target() {

make_target() {
mkdir -p bin
$GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./docker
$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
}

makeinstall_target() {
@@ -89,12 +90,12 @@ makeinstall_target() {
mkdir -p $INSTALL/usr/share/services
ln -sf /storage/.config/docker $INSTALL/etc/docker
cp bin/docker $INSTALL/usr/sbin
cp bin/dockerd $INSTALL/usr/sbin
cp -R $PKG_DIR/config/* $INSTALL/usr/config

# containerd
cp -P $(get_build_dir containerd)/bin/containerd $INSTALL/usr/sbin/docker-containerd
cp -P $(get_build_dir containerd)/bin/containerd-shim $INSTALL/usr/sbin/docker-containerd-shim
cp -P $(get_build_dir containerd)/bin/ctr $INSTALL/usr/sbin/docker-containerd-ctr

# runc
cp -P $(get_build_dir runc)/bin/runc $INSTALL/usr/sbin/docker-runc
@@ -8,7 +8,7 @@ ConditionPathExists=!/storage/.cache/services/docker.disabled
[Service]
Type=notify
EnvironmentFile=/storage/.config/docker/docker.conf
ExecStart=/usr/sbin/docker daemon -H fd:// $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS
ExecStart=/usr/sbin/dockerd --host=fd:// --group=root $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576

0 comments on commit ecf4c6e

Please sign in to comment.
You can’t perform that action at this time.