From bef20d54c7a1c7068534c0dedf4ca8759a74745d Mon Sep 17 00:00:00 2001 From: baigk Date: Fri, 1 Jan 2016 00:35:12 +0800 Subject: xintegrate special keepalived package JITA: COMPASS-234 Change-Id: I830bed488d5fd6e44ddada63a77c591be9581e45 Signed-off-by: baigk --- build/os/centos/rhel7/juno/Dockerfile.tmpl | 2 +- build/os/centos/rhel7/kilo/Dockerfile.tmpl | 2 +- build/os/ubuntu/trusty/juno/Dockerfile.tmpl | 2 +- build/os/ubuntu/trusty/kilo/Dockerfile.tmpl | 2 +- build/os/ubuntu/trusty/liberty/Dockerfile.tmpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build/os') 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) 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) 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) 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) 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) 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 -- cgit 1.2.3-korg