summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-09-28 03:24:14 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-09-28 03:24:14 +0000
commitf597677ccc0a438961666f0d8e95eac2bd4c186d (patch)
treedb7d7543bd1c0836dd9405cbe55ec42e7889ddf6 /build
parent8338b0630a39d6a07b20fcbb4fad54519aee228d (diff)
parent03f295703d62f1eb2436d6ba9c1fb889b9a3c53c (diff)
Merge "switch the source to ubuntu"
Diffstat (limited to 'build')
-rw-r--r--build/os/centos/rhel6/compass/Dockerfile.tmpl2
-rw-r--r--build/templates/RedHat_juno.tmpl4
2 files changed, 3 insertions, 3 deletions
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) <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 51cc0772..6381ef8d 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