Commit 5dae26ef authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[BUGFIX] Drop ondrej repo from 5.6 and 7.0 build to circumvent issue with...

[BUGFIX] Drop ondrej repo from 5.6 and 7.0 build to circumvent issue with missing icu-config bin when compiling php
parent 21d415d6
......@@ -4,14 +4,5 @@ source /pd_build/buildconfig
set -x
apt-get update
# ondrej with php 5.6
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main > /etc/apt/sources.list.d/php.list
# ondrej key - the recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
apt-get update
# currently no 3rd party repos for 5.6 build
apt-get -y dist-upgrade
......@@ -153,7 +153,7 @@ apt-get remove -y --purge \
minimal_apt_get_install \
make \
g++ \
libtidy5deb1 \
libtidy5 \
libmemcached11 \
#
......
......@@ -5,14 +5,6 @@ set -x
apt-get update
# ondrej with php 7.0
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main > /etc/apt/sources.list.d/php.list
# ondrej key - the recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
# for msodbcsql17 mssql-tools sqlserv
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
......
......@@ -160,7 +160,7 @@ apt-get remove -y --purge \
minimal_apt_get_install \
make \
g++ \
libtidy5deb1 \
libtidy5 \
libmemcached11 \
libc-client2007e \
#
......
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