aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-07-15 13:35:09 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-07-15 13:41:30 +0200
commit0b796fbf9834a43d708096eff435cde2ce8aefaa (patch)
treec0394d46a282540d52db2b3565c4cbc4661cb24e /tools
parentef6a62de1c91fec16d20485c0bef16cf93346227 (diff)
downloadkolla-0b796fbf9834a43d708096eff435cde2ce8aefaa.tar.gz
kolla-0b796fbf9834a43d708096eff435cde2ce8aefaa.zip
cleanup setup of Debian/Ubuntu CI nodes
Change-Id: I3a771793dfbbfc26f6d5716ba7a5b60c2e6154fa
Diffstat (limited to 'tools')
-rwxr-xr-xtools/setup_Debian.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh
index 97cd8d8e2..65ffc25f5 100755
--- a/tools/setup_Debian.sh
+++ b/tools/setup_Debian.sh
@@ -54,18 +54,20 @@ function setup_disk {
# (SamYaple)TODO: Remove the path overriding
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-. /etc/lsb-release
-
# Setup Docker repo and add signing key
+distro_id=$(lsb_release -is)
+distro_id=${distro_id,,}
+distro_codename=$(lsb_release -cs)
+
sudo apt-get update
sudo apt-get -y install apt-transport-https
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository "deb https://download.docker.com/linux/${distro_id} ${distro_codename} stable"
+curl -fsSL https://download.docker.com/linux/${distro_id}/gpg | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install --no-install-recommends docker-ce
sudo service docker stop
-if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then
+if [[ ${distro_codename} == "trusty" ]]; then
sudo apt-get -y install --no-install-recommends btrfs-tools
setup_disk
echo "DOCKER_OPTS=\"-s btrfs --insecure-registry 0.0.0.0/0\"" | sudo tee /etc/default/docker