From 238884dfe2e70619ec7ae346b2fe21cd10c67c06 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 24 Oct 2017 07:30:24 -0700 Subject: [PATCH] Revert gactions in Docker (#10115) --- Dockerfile | 1 - virtualization/Docker/Dockerfile.dev | 1 - virtualization/Docker/scripts/gactions | 10 ---------- virtualization/Docker/setup_docker_prereqs | 5 ----- 4 files changed, 17 deletions(-) delete mode 100644 virtualization/Docker/scripts/gactions diff --git a/Dockerfile b/Dockerfile index 3edad552671e20..5081b4ba721992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ LABEL 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 ca760d7a9f3f62..06676140702249 100644 --- a/virtualization/Docker/Dockerfile.dev +++ b/virtualization/Docker/Dockerfile.dev @@ -13,7 +13,6 @@ LABEL 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 deleted file mode 100644 index db39fdecfa1834..00000000000000 --- a/virtualization/Docker/scripts/gactions +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 ffe1d80704116e..bd70af28dce1d3 100755 --- a/virtualization/Docker/setup_docker_prereqs +++ b/virtualization/Docker/setup_docker_prereqs @@ -10,7 +10,6 @@ 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=( @@ -63,10 +62,6 @@ if [ "$INSTALL_SSOCR" == "yes" ]; then virtualization/Docker/scripts/ssocr fi -if [ "$INSTALL_GACTION" == "yes" ]; then - virtualization/Docker/scripts/gactions -fi - # Remove packages apt-get remove -y --purge ${PACKAGES_DEV[@]} apt-get -y --purge autoremove