aboutsummaryrefslogtreecommitdiffstats
path: root/build/os
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2016-01-01 00:35:12 +0800
committerbaigk <baiguoku@huawei.com>2016-01-04 21:24:04 +0800
commitbef20d54c7a1c7068534c0dedf4ca8759a74745d (patch)
tree6c919385867cf56d6096a22618fa974e282ede30 /build/os
parent617877977bb49b9a97f24b0fee583d104ef68891 (diff)
xintegrate special keepalived package
JITA: COMPASS-234 Change-Id: I830bed488d5fd6e44ddada63a77c591be9581e45 Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'build/os')
-rw-r--r--build/os/centos/rhel7/juno/Dockerfile.tmpl2
-rw-r--r--build/os/centos/rhel7/kilo/Dockerfile.tmpl2
-rw-r--r--build/os/ubuntu/trusty/juno/Dockerfile.tmpl2
-rw-r--r--build/os/ubuntu/trusty/kilo/Dockerfile.tmpl2
-rw-r--r--build/os/ubuntu/trusty/liberty/Dockerfile.tmpl2
5 files changed, 5 insertions, 5 deletions
diff --git a/build/os/centos/rhel7/juno/Dockerfile.tmpl b/build/os/centos/rhel7/juno/Dockerfile.tmpl
index 34945d00..adb930ff 100644
--- a/build/os/centos/rhel7/juno/Dockerfile.tmpl
+++ b/build/os/centos/rhel7/juno/Dockerfile.tmpl
@@ -5,7 +5,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf
#set packages = $getVar('spcial_packages', [])
#for package in $packages
-ADD ./RedHat/packages/$package /var/cache/yum/x86_64/7/base/packages/
+ADD ./RedHat/packages/redhat_packages/$package /var/cache/yum/x86_64/7/base/packages/
#end for
#set scripts = $getVar('scripts', [])
#for script in $scripts
diff --git a/build/os/centos/rhel7/kilo/Dockerfile.tmpl b/build/os/centos/rhel7/kilo/Dockerfile.tmpl
index 34945d00..adb930ff 100644
--- a/build/os/centos/rhel7/kilo/Dockerfile.tmpl
+++ b/build/os/centos/rhel7/kilo/Dockerfile.tmpl
@@ -5,7 +5,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf
#set packages = $getVar('spcial_packages', [])
#for package in $packages
-ADD ./RedHat/packages/$package /var/cache/yum/x86_64/7/base/packages/
+ADD ./RedHat/packages/redhat_packages/$package /var/cache/yum/x86_64/7/base/packages/
#end for
#set scripts = $getVar('scripts', [])
#for script in $scripts
diff --git a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
index 2071cb41..5972f883 100644
--- a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
@@ -6,7 +6,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
RUN rm -f /etc/apt/apt.conf.d/docker-clean
#set packages = $getVar('spcial_packages', [])
#for package in $packages
-ADD ./Debian/packages/$package /var/cache/apt/archives/
+ADD ./Debian/packages/debian_packages/$package /var/cache/apt/archives/
#end for
#set scripts = $getVar('scripts', [])
#for script in $scripts
diff --git a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
index 2071cb41..5972f883 100644
--- a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
@@ -6,7 +6,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
RUN rm -f /etc/apt/apt.conf.d/docker-clean
#set packages = $getVar('spcial_packages', [])
#for package in $packages
-ADD ./Debian/packages/$package /var/cache/apt/archives/
+ADD ./Debian/packages/debian_packages/$package /var/cache/apt/archives/
#end for
#set scripts = $getVar('scripts', [])
#for script in $scripts
diff --git a/build/os/ubuntu/trusty/liberty/Dockerfile.tmpl b/build/os/ubuntu/trusty/liberty/Dockerfile.tmpl
index 2071cb41..5972f883 100644
--- a/build/os/ubuntu/trusty/liberty/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/liberty/Dockerfile.tmpl
@@ -6,7 +6,7 @@ MAINTAINER Chigang(Justin) <chigang@huawei.com>
RUN rm -f /etc/apt/apt.conf.d/docker-clean
#set packages = $getVar('spcial_packages', [])
#for package in $packages
-ADD ./Debian/packages/$package /var/cache/apt/archives/
+ADD ./Debian/packages/debian_packages/$package /var/cache/apt/archives/
#end for
#set scripts = $getVar('scripts', [])
#for script in $scripts