switch the source to ubuntu

JIRA: COMPASS-74

Change-Id: Ic5832ede3894a5f7955be375171de9d4aee99fe0
Signed-off-by: m00133142 <meimei@huawei.com>

diff --git a/build/os/centos/rhel6/compass/Dockerfile.tmpl b/build/os/centos/rhel6/compass/Dockerfile.tmpl
index 29c0542..74e9e39 100644 (file)
--- a/build/os/centos/rhel6/compass/Dockerfile.tmpl
+++ b/build/os/centos/rhel6/compass/Dockerfile.tmpl
@@ -4,7 +4,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
 # TODO: Is there some easy way to get the fastest/closest mirror?
 # RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list
 RUN rm -f /etc/yum.repos.d/*
-ADD ./rhel6/base.repo /etc/yum.repos.d/
+#ADD ./rhel6/base.repo /etc/yum.repos.d/
 RUN yum update -y
 
 # set cache enable

diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl
index 91be615..2a60d40 100644 (file)
--- a/build/templates/RedHat_juno.tmpl
+++ b/build/templates/RedHat_juno.tmpl
@@ -4,11 +4,11 @@ set -x
 yum remove systemd -y
 # add 163 repo
 yum install wget -y
-wget -O /etc/yum.repos.d/CentOS7-Base-163.repo  http://mirrors.163.com/.help/CentOS7-Base-163.repo
+#wget -O /etc/yum.repos.d/CentOS7-Base-163.repo  http://mirrors.163.com/.help/CentOS7-Base-163.repo
 wget -O /epel-release-7-5.noarch.rpm http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
 yum remove wget iptables-services -y
 yum update -y
-rm -f /etc/yum.repos.d/CentOS-*.repo
+#rm -f /etc/yum.repos.d/CentOS-*.repo
 yum repolist
 yum clean all
 # add openstack juno repo