From f43a362f33f8a0ed172b22a99ce781dd3b008c21 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 31 Jul 2018 14:41:01 -0700 Subject: [PATCH] Made docker install agnostic to ubuntu version This is the first step toward gracefully upgrading all VMs to ubuntu 16.04. Change-Id: If2b7c57b43165bd99984e76eba5f29fd8bfc6df0 Issue-ID: INT-606 Signed-off-by: Gary Wu --- boot/aaf_install.sh | 2 +- boot/aai_install.sh | 2 +- boot/appc_install.sh | 2 +- boot/clamp_install.sh | 2 +- boot/dcae2_install.sh | 2 +- boot/mr_install.sh | 2 +- boot/music_install.sh | 2 +- boot/oof_install.sh | 2 +- boot/openo_install.sh | 2 +- boot/policy_install.sh | 2 +- boot/portal_install.sh | 2 +- boot/robot_install.sh | 2 +- boot/sdc_install.sh | 2 +- boot/sdnc_install.sh | 2 +- boot/sms_install.sh | 2 +- boot/so_install.sh | 2 +- boot/vid_install.sh | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh index 882c3ee4..c8531d55 100644 --- a/boot/aaf_install.sh +++ b/boot/aaf_install.sh @@ -72,7 +72,7 @@ mv /opt/aaf_serv.sh /etc/init.d update-rc.d aaf_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 981e026f..2c981e09 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -72,7 +72,7 @@ mv /opt/aai_serv.sh /etc/init.d update-rc.d aai_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/appc_install.sh b/boot/appc_install.sh index 7efedb81..fe4be354 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -71,7 +71,7 @@ mv /opt/appc_serv.sh /etc/init.d update-rc.d appc_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/clamp_install.sh b/boot/clamp_install.sh index 88b0370e..5063cd62 100644 --- a/boot/clamp_install.sh +++ b/boot/clamp_install.sh @@ -71,7 +71,7 @@ mv /opt/clamp_serv.sh /etc/init.d update-rc.d clamp_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh index 05722c36..adf619a5 100755 --- a/boot/dcae2_install.sh +++ b/boot/dcae2_install.sh @@ -63,7 +63,7 @@ mv /opt/dcae2_serv.sh /etc/init.d update-rc.d dcae2_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y "linux-image-extra-$(uname -r)" linux-image-extra-virtual jq apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/mr_install.sh b/boot/mr_install.sh index a6a4f4b8..d11becfb 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -76,7 +76,7 @@ unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dbcl_vm_init.sh > /opt/dbcl_vm_init chmod +x /opt/dbcl_vm_init.sh # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/music_install.sh b/boot/music_install.sh index a080034b..5149214f 100644 --- a/boot/music_install.sh +++ b/boot/music_install.sh @@ -71,7 +71,7 @@ mv /opt/music_serv.sh /etc/init.d update-rc.d music_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/oof_install.sh b/boot/oof_install.sh index 8139b890..645b29c1 100644 --- a/boot/oof_install.sh +++ b/boot/oof_install.sh @@ -71,7 +71,7 @@ mv /opt/oof_serv.sh /etc/init.d update-rc.d oof_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/openo_install.sh b/boot/openo_install.sh index 69cd2f76..7dd1c0c1 100644 --- a/boot/openo_install.sh +++ b/boot/openo_install.sh @@ -85,7 +85,7 @@ mv /opt/openo_serv.sh /etc/init.d update-rc.d openo_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 6394fc18..0ba20829 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -71,7 +71,7 @@ mv /opt/policy_serv.sh /etc/init.d update-rc.d policy_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 60b3d3d1..b8d7f1cd 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -71,7 +71,7 @@ mv /opt/portal_serv.sh /etc/init.d update-rc.d portal_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/robot_install.sh b/boot/robot_install.sh index 827b2ce4..a41cf886 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -82,7 +82,7 @@ cp /opt/robot_serv.sh /etc/init.d update-rc.d robot_serv.sh defaults # Download and install docker-engine -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/sdc_install.sh b/boot/sdc_install.sh index b0d58996..3efcf1fc 100644 --- a/boot/sdc_install.sh +++ b/boot/sdc_install.sh @@ -71,7 +71,7 @@ mv /opt/sdc_serv.sh /etc/init.d update-rc.d sdc_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index 196542fa..e767952c 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -71,7 +71,7 @@ mv /opt/sdnc_serv.sh /etc/init.d update-rc.d sdnc_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/sms_install.sh b/boot/sms_install.sh index 5522c373..b85ea52b 100644 --- a/boot/sms_install.sh +++ b/boot/sms_install.sh @@ -71,7 +71,7 @@ mv /opt/sms_serv.sh /etc/init.d update-rc.d sms_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/so_install.sh b/boot/so_install.sh index f58a6167..f346cbf5 100644 --- a/boot/so_install.sh +++ b/boot/so_install.sh @@ -72,7 +72,7 @@ mv /opt/so_serv.sh /etc/init.d update-rc.d so_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine diff --git a/boot/vid_install.sh b/boot/vid_install.sh index 74018f60..6848c56d 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -71,7 +71,7 @@ mv /opt/vid_serv.sh /etc/init.d update-rc.d vid_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine -- 2.16.6