commit 66783737d052a09bd73a482190bfbffe8c44008d
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Dec 04 02:22:08 2017 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Dec 15 04:44:37 2017 +0000
tree dfcafac6fff315e5e8bb4f81bca0d95e37b4930b
parent 0280331a0bb8ca5ba5d15a77269a1c54b9d8d515

Squashed 'import-layers/meta-virtualization/' changes from 898481a9d02..eb6b5129561

Yocto 2.2.2 (Morty)

Change-Id: Ieb9deb09b6214273b4434f9e90deb8bf71f8e8f2
git-subtree-dir: import-layers/meta-virtualization
git-subtree-split: eb6b5129561eda9ea1f47e85ab9ed9e5a6b8f64c
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb

diff --git a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb
index b0fda35..04dc76d 100644
--- a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb
+++ b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb
@@ -58,8 +58,8 @@
                   ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \
                  "
 RDEPENDS_${PN} += "containerd runc"
-RRECOMMENDS_${PN} = "lxc docker-registry rt-tests"
-RRECOMMENDS_${PN} += " kernel-module-dm-thin-pool kernel-module-nf-nat"
+RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat"
+RSUGGESTS_${PN} = "lxc docker-registry rt-tests"
 DOCKER_PKG="github.com/docker/docker"
 
 do_configure[noexec] = "1"
@@ -122,7 +122,7 @@
 
 INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
 INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
-INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_PARAMS_${PN} = "defaults"
 
 do_install() {
 	mkdir -p ${D}/${bindir}

import-layers/meta-virtualization/recipes-containers/docker/files/docker.init

diff --git a/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init b/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init
index 9c01c75..2e8eb9e 100644
--- a/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init
+++ b/import-layers/meta-virtualization/recipes-containers/docker/files/docker.init
@@ -28,6 +28,7 @@
 pidfile="/var/run/$prog.pid"
 lockfile="/var/lock/subsys/$prog"
 logfile="/var/log/$prog"
+other_args="--registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 --raw-logs"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -38,8 +39,8 @@
 
     if ! [ -f $pidfile ]; then
         printf "Starting $prog:\t"
-        echo "\n$(date)\n" >> $logfile
-        "$unshare" -m -- $exec -d $other_args &>> $logfile &
+        echo -e "\n$(date)\n" >> $logfile
+        "$unshare" -m -- $exec daemon $other_args &>> $logfile &
         pid=$!
         touch $lockfile
         # wait up to 10 seconds for the pidfile to exist.  see