From 6e09f7e132b6078190bc353a081dc9f77eddf3bb Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:12:15 +0300 Subject: [PATCH] [Ubuntu] Do not use apt-fast (#4784) --- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/scripts/installers/php.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index f9e6dc30b..32113b31e 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -53,7 +53,7 @@ echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" # add extra permissions to be able execute command without sudo chmod -R 777 /usr/lib/jvm # Install Ant -apt-fast install -y --no-install-recommends ant ant-optional +apt-get install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index f415a78e4..c11eb620d 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -18,7 +18,7 @@ php_versions=$(get_toolset_value '.php.versions[]') for version in $php_versions; do echo "Installing PHP $version" - apt-fast install -y --no-install-recommends \ + apt-get install -y --no-install-recommends \ php$version \ php$version-amqp \ php$version-apcu \ @@ -65,19 +65,19 @@ for version in $php_versions; do php$version-zmq if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then - apt-fast install -y --no-install-recommends php$version-mcrypt php$version-recode + apt-get install -y --no-install-recommends php$version-mcrypt php$version-recode fi if [[ $version == "7.2" || $version == "7.3" ]]; then - apt-fast install -y --no-install-recommends php$version-recode + apt-get install -y --no-install-recommends php$version-recode fi if [[ $version != "8.0" && $version != "8.1" ]]; then - apt-fast install -y --no-install-recommends php$version-xmlrpc php$version-json + apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json fi if [[ $version != "5.6" && $version != "7.0" ]]; then - apt-fast install -y --no-install-recommends php$version-pcov + apt-get install -y --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default # https://github.com/krakjoe/pcov#interoperability @@ -85,13 +85,13 @@ for version in $php_versions; do fi if [[ $version = "7.0" || $version = "7.1" ]]; then - apt-fast install -y --no-install-recommends php$version-sodium + apt-get install -y --no-install-recommends php$version-sodium fi done -apt-fast install -y --no-install-recommends php-pear +apt-get install -y --no-install-recommends php-pear -apt-fast install -y --no-install-recommends snmp +apt-get install -y --no-install-recommends snmp # Install composer php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"