From e3a2e586237deaa2cf57cbcaf0e5d9edbee82dbb Mon Sep 17 00:00:00 2001
From: Daniel Bowman <daniel@danielbowman.co.uk>
Date: Tue, 14 Aug 2018 10:53:08 +0100
Subject: [PATCH] remove-phantomjs-from-docker (#15936)
---
Dockerfile | 1 -
virtualization/Docker/Dockerfile.dev | 1 -
virtualization/Docker/scripts/phantomjs | 15 ---------------
virtualization/Docker/setup_docker_prereqs | 5 -----
4 files changed, 22 deletions(-)
delete mode 100755 virtualization/Docker/scripts/phantomjs
diff --git a/Dockerfile b/Dockerfile
index 75d9e9eb716..c84e6162d04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
#ENV INSTALL_OPENALPR no
#ENV INSTALL_FFMPEG no
#ENV INSTALL_LIBCEC no
-#ENV INSTALL_PHANTOMJS no
#ENV INSTALL_SSOCR no
#ENV INSTALL_IPERF3 no
diff --git a/virtualization/Docker/Dockerfile.dev b/virtualization/Docker/Dockerfile.dev
index d0599c2e74c..79072703031 100644
--- a/virtualization/Docker/Dockerfile.dev
+++ b/virtualization/Docker/Dockerfile.dev
@@ -10,7 +10,6 @@ LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
#ENV INSTALL_OPENALPR no
#ENV INSTALL_FFMPEG no
#ENV INSTALL_LIBCEC no
-#ENV INSTALL_PHANTOMJS no
#ENV INSTALL_COAP no
#ENV INSTALL_SSOCR no
#ENV INSTALL_IPERF3 no
diff --git a/virtualization/Docker/scripts/phantomjs b/virtualization/Docker/scripts/phantomjs
deleted file mode 100755
index 7700b08f293..00000000000
--- a/virtualization/Docker/scripts/phantomjs
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Sets up phantomjs.
-
-# Stop on errors
-set -e
-
-PHANTOMJS_VERSION="2.1.1"
-
-cd /usr/src/app/
-mkdir -p build && cd build
-
-curl -LSO https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2
-tar -xjf phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2
-mv phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
-/usr/bin/phantomjs -v
\ No newline at end of file
diff --git a/virtualization/Docker/setup_docker_prereqs b/virtualization/Docker/setup_docker_prereqs
index 15504ea57af..65acf92b855 100755
--- a/virtualization/Docker/setup_docker_prereqs
+++ b/virtualization/Docker/setup_docker_prereqs
@@ -7,7 +7,6 @@ set -e
INSTALL_TELLSTICK="${INSTALL_TELLSTICK:-yes}"
INSTALL_OPENALPR="${INSTALL_OPENALPR:-yes}"
INSTALL_LIBCEC="${INSTALL_LIBCEC:-yes}"
-INSTALL_PHANTOMJS="${INSTALL_PHANTOMJS:-yes}"
INSTALL_SSOCR="${INSTALL_SSOCR:-yes}"
# Required debian packages for running hass or components
@@ -59,10 +58,6 @@ if [ "$INSTALL_LIBCEC" == "yes" ]; then
virtualization/Docker/scripts/libcec
fi
-if [ "$INSTALL_PHANTOMJS" == "yes" ]; then
- virtualization/Docker/scripts/phantomjs
-fi
-
if [ "$INSTALL_SSOCR" == "yes" ]; then
virtualization/Docker/scripts/ssocr
fi
--
GitLab