From 03f295703d62f1eb2436d6ba9c1fb889b9a3c53c Mon Sep 17 00:00:00 2001 From: m00133142 Date: Fri, 25 Sep 2015 16:52:36 +0800 Subject: switch the source to ubuntu JIRA: COMPASS-74 Change-Id: Ic5832ede3894a5f7955be375171de9d4aee99fe0 Signed-off-by: m00133142 --- build/os/centos/rhel6/compass/Dockerfile.tmpl | 2 +- build/templates/RedHat_juno.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/os/centos/rhel6/compass/Dockerfile.tmpl b/build/os/centos/rhel6/compass/Dockerfile.tmpl index 29c05426..74e9e394 100644 --- a/build/os/centos/rhel6/compass/Dockerfile.tmpl +++ b/build/os/centos/rhel6/compass/Dockerfile.tmpl @@ -4,7 +4,7 @@ MAINTAINER Chigang(Justin) # 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 91be6151..2a60d402 100644 --- 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 -- cgit 1.2.3-korg