From 796a3ff49da9327cf639e13dce4c588339f0882c Mon Sep 17 00:00:00 2001 From: Chris Kacerguis Date: Sun, 22 Oct 2017 01:09:49 -0500 Subject: [PATCH] Added gaction script to support the new Google Assistant component in Docker (#10019) * added gactions install script * added gaction setup step * added ability to not install gaction * updated dev docker file --- Dockerfile | 1 + virtualization/Docker/Dockerfile.dev | 1 + virtualization/Docker/scripts/gactions | 10 ++++++++++ virtualization/Docker/setup_docker_prereqs | 5 +++++ 4 files changed, 17 insertions(+) create mode 100644 virtualization/Docker/scripts/gactions diff --git a/Dockerfile b/Dockerfile index 3eadc8e7b0300..b4e1870affc33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ MAINTAINER Paulus Schoutsen #ENV INSTALL_LIBCEC no #ENV INSTALL_PHANTOMJS no #ENV INSTALL_SSOCR no +#ENV INSTALL_GACTION no VOLUME /config diff --git a/virtualization/Docker/Dockerfile.dev b/virtualization/Docker/Dockerfile.dev index 131819a6ca0d8..69bbe6e1fa1a3 100644 --- a/virtualization/Docker/Dockerfile.dev +++ b/virtualization/Docker/Dockerfile.dev @@ -13,6 +13,7 @@ MAINTAINER Paulus Schoutsen #ENV INSTALL_PHANTOMJS no #ENV INSTALL_COAP no #ENV INSTALL_SSOCR no +#ENV INSTALL_GACTION no VOLUME /config diff --git a/virtualization/Docker/scripts/gactions b/virtualization/Docker/scripts/gactions new file mode 100644 index 0000000000000..db39fdecfa183 --- /dev/null +++ b/virtualization/Docker/scripts/gactions @@ -0,0 +1,10 @@ +#!/bin/bash +# Sets up gactions for the google_assistant component. + +# Stop on errors +set -e + +curl -LSO https://dl.google.com/gactions/updates/bin/linux/amd64/gactions/gactions +mv gactions /usr/bin/gactions +chmod +x /usr/bin/gactions +/usr/bin/gactions -V diff --git a/virtualization/Docker/setup_docker_prereqs b/virtualization/Docker/setup_docker_prereqs index bd70af28dce1d..cf8d0c22dec67 100755 --- a/virtualization/Docker/setup_docker_prereqs +++ b/virtualization/Docker/setup_docker_prereqs @@ -10,6 +10,7 @@ INSTALL_FFMPEG="${INSTALL_FFMPEG:-yes}" INSTALL_LIBCEC="${INSTALL_LIBCEC:-yes}" INSTALL_PHANTOMJS="${INSTALL_PHANTOMJS:-yes}" INSTALL_SSOCR="${INSTALL_SSOCR:-yes}" +INSTALL_GACTION="${INSTALL_GACTION:-yes}" # Required debian packages for running hass or components PACKAGES=( @@ -62,6 +63,10 @@ if [ "$INSTALL_SSOCR" == "yes" ]; then virtualization/Docker/scripts/ssocr fi +if [ "$INSTALL_GACTION" == "yes" ]; then + virtualization/Docker/scripts/gaction +fi + # Remove packages apt-get remove -y --purge ${PACKAGES_DEV[@]} apt-get -y --purge autoremove