please replace all the URL that cannot be accessed from international

JIRA: COMPASS-110

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

diff --git a/build/os/centos/rhel6/base.repo b/build/os/centos/rhel6/base.repo
deleted file mode 100644 (file)
index e1ea7c4..0000000
--- a/build/os/centos/rhel6/base.repo
+++ /dev/null
@@ -1,52 +0,0 @@
-# CentOS-Base.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/os/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#released updates
-[updates]
-name=CentOS-$releasever - Updates - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/updates/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/extras/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/centosplus/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#contrib - packages by Centos Users
-[contrib]
-name=CentOS-$releasever - Contrib - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/contrib/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6

diff --git a/build/os/centos/rhel7/juno/Dockerfile.tmpl b/build/os/centos/rhel7/juno/Dockerfile.tmpl
index 450e5c8..34945d0 100644 (file)
--- a/build/os/centos/rhel7/juno/Dockerfile.tmpl
+++ b/build/os/centos/rhel7/juno/Dockerfile.tmpl
@@ -1,9 +1,6 @@
 FROM centos:7.1.1503
 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
-
 # set cache enable
 RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf
 #set packages = $getVar('spcial_packages', [])

diff --git a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
index d723b6e..2071cb4 100644 (file)
--- a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
@@ -1,9 +1,6 @@
 FROM ubuntu:14.04.3
 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 apt-get update
 
 RUN rm -f /etc/apt/apt.conf.d/docker-clean

diff --git a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
index d723b6e..2071cb4 100644 (file)
--- a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
@@ -1,9 +1,6 @@
 FROM ubuntu:14.04.3
 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 apt-get update
 
 RUN rm -f /etc/apt/apt.conf.d/docker-clean

diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl
index 6381ef8..e8a54ac 100644 (file)
--- a/build/templates/RedHat_juno.tmpl
+++ b/build/templates/RedHat_juno.tmpl
@@ -4,7 +4,6 @@ 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 /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