From 005cbc0b89405e210a0b8451c3006ced54e67f1b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Tue, 16 Oct 2018 16:32:00 +0200 Subject: [PATCH] OS: use newer docker run command (#217) * OS: use newer docker run command * Update hassos-supervisor --- buildroot-external/rootfs-overlay/usr/sbin/hassos-cli | 2 +- .../rootfs-overlay/usr/sbin/hassos-supervisor | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli index aecb62d08..e6f5914c7 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli @@ -11,7 +11,7 @@ CLI_DATA=/mnt/data/cli mkdir -p ${CLI_DATA} # Run CLI -docker run \ +docker container run \ --rm -ti --init \ --security-opt apparmor="${APPARMOR}" \ -v ${CLI_DATA}:/data \ diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor index e614a1454..eef027765 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor @@ -19,8 +19,8 @@ if ! grep ${APPARMOR} /sys/kernel/security/apparmor/profiles > /dev/null; then fi runSupervisor() { - docker rm --force hassos_supervisor || true - docker run --name hassos_supervisor \ + docker container rm --force hassos_supervisor || true + docker container run --name hassos_supervisor \ --security-opt apparmor="${APPARMOR}" \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/dbus:/var/run/dbus \ @@ -34,4 +34,4 @@ runSupervisor() { # Run supervisor mkdir -p ${HASSOS_DATA} -([ "${HASSOS_IMAGE_ID}" = "${HASSOS_CONTAINER_ID}" ] && docker start --attach hassos_supervisor) || runSupervisor +([ "${HASSOS_IMAGE_ID}" = "${HASSOS_CONTAINER_ID}" ] && docker container start --attach hassos_supervisor) || runSupervisor