diff --git a/virtualization/Docker/scripts/ffmpeg b/virtualization/Docker/scripts/ffmpeg deleted file mode 100755 index 914c2648e56..00000000000 --- a/virtualization/Docker/scripts/ffmpeg +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Sets up ffmpeg. - -# Stop on errors -set -e - -PACKAGES=( - ffmpeg -) - -apt-get install -y --no-install-recommends ${PACKAGES[@]} diff --git a/virtualization/Docker/scripts/iperf3 b/virtualization/Docker/scripts/iperf3 deleted file mode 100755 index 2d9d5a33761..00000000000 --- a/virtualization/Docker/scripts/iperf3 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Sets up iperf3. - -# Stop on errors -set -e - -PACKAGES=( - iperf3 -) - -apt-get install -y --no-install-recommends ${PACKAGES[@]} diff --git a/virtualization/Docker/setup_docker_prereqs b/virtualization/Docker/setup_docker_prereqs index 97c3c6bdd1c..0cb49fde54e 100755 --- a/virtualization/Docker/setup_docker_prereqs +++ b/virtualization/Docker/setup_docker_prereqs @@ -6,11 +6,9 @@ set -e INSTALL_TELLSTICK="${INSTALL_TELLSTICK:-yes}" INSTALL_OPENALPR="${INSTALL_OPENALPR:-yes}" -INSTALL_FFMPEG="${INSTALL_FFMPEG:-yes}" INSTALL_LIBCEC="${INSTALL_LIBCEC:-yes}" INSTALL_PHANTOMJS="${INSTALL_PHANTOMJS:-yes}" INSTALL_SSOCR="${INSTALL_SSOCR:-yes}" -INSTALL_IPERF3="${INSTALL_IPERF3:-yes}" # Required debian packages for running hass or components PACKAGES=( @@ -28,6 +26,10 @@ PACKAGES=( libudev-dev # homeassistant.components.homekit_controller libmpc-dev libmpfr-dev libgmp-dev + # homeassistant.components.ffmpeg + ffmpeg + # homeassistant.components.sensor.iperf3 + iperf3 ) # Required debian packages for building dependencies @@ -41,6 +43,10 @@ PACKAGES_DEV=( apt-get update apt-get install -y --no-install-recommends ${PACKAGES[@]} ${PACKAGES_DEV[@]} +# This is a list of scripts that install additional dependencies. If you only +# need to install a package from the official debian repository, just add it +# to the list above. Only create a script if you need compiling, manually +# downloading or a 3th party repository. if [ "$INSTALL_TELLSTICK" == "yes" ]; then virtualization/Docker/scripts/tellstick fi @@ -49,10 +55,6 @@ if [ "$INSTALL_OPENALPR" == "yes" ]; then virtualization/Docker/scripts/openalpr fi -if [ "$INSTALL_FFMPEG" == "yes" ]; then - virtualization/Docker/scripts/ffmpeg -fi - if [ "$INSTALL_LIBCEC" == "yes" ]; then virtualization/Docker/scripts/libcec fi @@ -65,10 +67,6 @@ if [ "$INSTALL_SSOCR" == "yes" ]; then virtualization/Docker/scripts/ssocr fi -if [ "$INSTALL_IPERF3" == "yes" ]; then - virtualization/Docker/scripts/iperf3 -fi - # Remove packages apt-get remove -y --purge ${PACKAGES_DEV[@]} apt-get -y --purge autoremove