OS: use newer docker run command (#217)

* OS: use newer docker run command

* Update hassos-supervisor
This commit is contained in:
Pascal Vizeli 2018-10-16 16:32:00 +02:00 committed by GitHub
parent 482e6f7a7b
commit 005cbc0b89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ CLI_DATA=/mnt/data/cli
mkdir -p ${CLI_DATA} mkdir -p ${CLI_DATA}
# Run CLI # Run CLI
docker run \ docker container run \
--rm -ti --init \ --rm -ti --init \
--security-opt apparmor="${APPARMOR}" \ --security-opt apparmor="${APPARMOR}" \
-v ${CLI_DATA}:/data \ -v ${CLI_DATA}:/data \

View File

@ -19,8 +19,8 @@ if ! grep ${APPARMOR} /sys/kernel/security/apparmor/profiles > /dev/null; then
fi fi
runSupervisor() { runSupervisor() {
docker rm --force hassos_supervisor || true docker container rm --force hassos_supervisor || true
docker run --name hassos_supervisor \ docker container run --name hassos_supervisor \
--security-opt apparmor="${APPARMOR}" \ --security-opt apparmor="${APPARMOR}" \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v /var/run/dbus:/var/run/dbus \ -v /var/run/dbus:/var/run/dbus \
@ -34,4 +34,4 @@ runSupervisor() {
# Run supervisor # Run supervisor
mkdir -p ${HASSOS_DATA} 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