From 916792f2e89af882d6a9d383d58459e7407c16ec Mon Sep 17 00:00:00 2001 From: MJB <mjb@it-innovation.soton.ac.uk> Date: Thu, 28 Feb 2019 18:05:35 +0000 Subject: [PATCH] forced gz compression type for apt-get --- scripts/clmc-agent/install.sh | 2 +- scripts/clmc-service/install-clmc-service.sh | 2 +- scripts/clmc-service/install-neo4j.sh | 2 +- scripts/clmc-service/install-tick-stack.sh | 2 +- src/test/clmctest/services/apache/install.sh | 2 +- src/test/clmctest/services/ffmpeg/install.sh | 2 +- src/test/clmctest/services/minio/install.sh | 2 +- src/test/clmctest/services/mongo/install.sh | 2 +- src/test/clmctest/services/pytest/install.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/clmc-agent/install.sh b/scripts/clmc-agent/install.sh index 93bdd81..9bea89e 100755 --- a/scripts/clmc-agent/install.sh +++ b/scripts/clmc-agent/install.sh @@ -27,7 +27,7 @@ # Force fail on command fail set -euo pipefail -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz apt-get install wget -y echo "Installing Telegraf agent" diff --git a/scripts/clmc-service/install-clmc-service.sh b/scripts/clmc-service/install-clmc-service.sh index 83cefd1..581a17a 100755 --- a/scripts/clmc-service/install-clmc-service.sh +++ b/scripts/clmc-service/install-clmc-service.sh @@ -23,7 +23,7 @@ #// Created for Project : FLAME #// #///////////////////////////////////////////////////////////////////////// -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz apt-get install libssl-dev -y # Create the database for the WHOAMI API diff --git a/scripts/clmc-service/install-neo4j.sh b/scripts/clmc-service/install-neo4j.sh index a841a48..d2ac577 100755 --- a/scripts/clmc-service/install-neo4j.sh +++ b/scripts/clmc-service/install-neo4j.sh @@ -41,7 +41,7 @@ # http 7474 including the browser on localhost:7474 # https 7473 -sudo apt update +sudo apt update -o Acquire::CompressionTypes::Order::=gz sudo apt install wget openjdk-8-jdk -y # configure apt diff --git a/scripts/clmc-service/install-tick-stack.sh b/scripts/clmc-service/install-tick-stack.sh index b6d63b1..a5d364e 100755 --- a/scripts/clmc-service/install-tick-stack.sh +++ b/scripts/clmc-service/install-tick-stack.sh @@ -35,7 +35,7 @@ KAPACITOR_CHECKSUM=eea9b215f241906570eafe3857e1d4c5 CHRONOGRAF_VERSION=1.4.4.2 CHRONOGRAF_CHECKSUM=eea6915aa6db8f134fcd3b095e863b773bfb3a16a26e346dd65904a07df97963 -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz echo "----> Installing wget" apt-get install -y wget diff --git a/src/test/clmctest/services/apache/install.sh b/src/test/clmctest/services/apache/install.sh index fc93bf5..bb0c980 100755 --- a/src/test/clmctest/services/apache/install.sh +++ b/src/test/clmctest/services/apache/install.sh @@ -25,7 +25,7 @@ #///////////////////////////////////////////////////////////////////////// # Install apache -sudo apt-get update +sudo apt-get update -o Acquire::CompressionTypes::Order::=gz sudo apt-get -y install apache2 # start apache diff --git a/src/test/clmctest/services/ffmpeg/install.sh b/src/test/clmctest/services/ffmpeg/install.sh index cb3c873..c25cc84 100755 --- a/src/test/clmctest/services/ffmpeg/install.sh +++ b/src/test/clmctest/services/ffmpeg/install.sh @@ -20,7 +20,7 @@ ## Created Date : 09-02-2018 ## Created for Project : FLAME -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz apt-get -y install zip python wget http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-5-1-621.x86_64-unknown-linux.zip diff --git a/src/test/clmctest/services/minio/install.sh b/src/test/clmctest/services/minio/install.sh index 24c5e25..cf07bc1 100755 --- a/src/test/clmctest/services/minio/install.sh +++ b/src/test/clmctest/services/minio/install.sh @@ -25,7 +25,7 @@ #///////////////////////////////////////////////////////////////////////// # Prerequisites -sudo apt-get update +sudo apt-get update -o Acquire::CompressionTypes::Order::=gz sudo apt-get install -y wget git # Environment variables for this process diff --git a/src/test/clmctest/services/mongo/install.sh b/src/test/clmctest/services/mongo/install.sh index 4c68f77..e980c23 100755 --- a/src/test/clmctest/services/mongo/install.sh +++ b/src/test/clmctest/services/mongo/install.sh @@ -25,7 +25,7 @@ #///////////////////////////////////////////////////////////////////////// # Install apache -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list apt-get update diff --git a/src/test/clmctest/services/pytest/install.sh b/src/test/clmctest/services/pytest/install.sh index f63ff21..db3d235 100755 --- a/src/test/clmctest/services/pytest/install.sh +++ b/src/test/clmctest/services/pytest/install.sh @@ -23,7 +23,7 @@ #// Created for Project : FLAME #// #///////////////////////////////////////////////////////////////////////// -apt-get update +apt-get update -o Acquire::CompressionTypes::Order::=gz apt-get -y install python3 python3-pip python-influxdb update-alternatives --install /usr/bin/python python /usr/bin/python3 10 -- GitLab