Commit 3d9c02e2 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] php70: remove firefox, php71: remove firefox add chrome

parent f003bc4d
......@@ -5,6 +5,7 @@ set -x
# xvfb and some hard dependencies of firefox
minimal_apt_get_install \
xvfb \
gconf2 \
google-chrome-stable \
#
......
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# xvfb and some hard dependencies of firefox
minimal_apt_get_install \
xvfb \
libxcomposite1 \
libasound2 \
libgtk2.0-0 \
#
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.6.0esr/linux-x86_64/en-US/firefox-45.6.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
tar xv -C /opt/ -f /tmp/firefox.tar.bz2
rm /tmp/firefox.tar.bz2
ln -s /opt/firefox/firefox /usr/bin/firefox
......@@ -13,6 +13,5 @@ set -x
/pd_build/nodejs.sh
/pd_build/php.sh
/pd_build/chrome.sh
/pd_build/firefox.sh
/pd_build/finalize.sh
......@@ -6,16 +6,10 @@ set -x
# xvfb and some hard dependencies of firefox
minimal_apt_get_install \
xvfb \
libxcomposite1 \
libasound2 \
libgtk2.0-0 \
gconf2 \
google-chrome-stable \
#
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.6.0esr/linux-x86_64/en-US/firefox-45.6.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
tar xv -C /opt/ -f /tmp/firefox.tar.bz2
rm /tmp/firefox.tar.bz2
ln -s /opt/firefox/firefox /usr/bin/firefox
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
......@@ -3,7 +3,7 @@ set -e
source /pd_build/buildconfig
set -x
## ondrej with php 7.1
# ondrej with php 7.1
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main > /etc/apt/sources.list.d/php.list
# The recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
......@@ -11,5 +11,9 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
## NodeSource's Node.js repository
# google-chrome
curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
# NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
......@@ -9,8 +9,10 @@ apt-get remove -y --purge \
automake \
autotools-dev \
binutils \
build-essential \
cpp \
cpp-5 \
dpkg-dev \
file \
gcc \
gcc-5 \
......
......@@ -11,6 +11,6 @@ set -x
/pd_build/memcached.sh
/pd_build/nodejs.sh
/pd_build/php.sh
/pd_build/firefox.sh
/pd_build/chrome.sh
/pd_build/finalize.sh
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment