Commit 892aaddd authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/1.0.10'

parents ea88f82a ce1e9907
......@@ -37,7 +37,7 @@ SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=1
MINOR_PHP70=0
PATCHLEVEL_PHP70=4
PATCHLEVEL_PHP70=5
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
......@@ -80,7 +80,7 @@ SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=1
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=19
PATCHLEVEL_BAMBOO_PHP70=20
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
......
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# xvfb and some hard dependencies of firefox
minimal_apt_get_install \
gconf2 \
google-chrome-stable \
#
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
......@@ -8,5 +8,9 @@ curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list
curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
## 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 -
......@@ -15,7 +15,3 @@ curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.6.0esr/l
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
......@@ -12,6 +12,7 @@ set -x
/pd_build/memcached.sh
/pd_build/nodejs.sh
/pd_build/php.sh
/pd_build/chrome.sh
/pd_build/firefox.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