From 4265a1ec3817d137332f6a771bbbef0eaee5879c Mon Sep 17 00:00:00 2001 From: baigk Date: Tue, 15 Sep 2015 16:01:00 +0800 Subject: Add parameter allows users to add their own package or scripts of making package to ISO file JIRA: COMPASS-55 Change-Id: I2ef6539ebf73fe57fb2a5dcb01ff5d8c4727dc1f Signed-off-by: baigk --- build/os/centos/rhel6/compass/Dockerfile.tmpl | 5 ++--- build/os/centos/rhel7/juno/Dockerfile.tmpl | 5 ++--- build/os/ubuntu/trusty/juno/Dockerfile.tmpl | 5 ++--- build/os/ubuntu/trusty/kilo/Dockerfile.tmpl | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'build/os') diff --git a/build/os/centos/rhel6/compass/Dockerfile.tmpl b/build/os/centos/rhel6/compass/Dockerfile.tmpl index 6740dc41..29c05426 100644 --- a/build/os/centos/rhel6/compass/Dockerfile.tmpl +++ b/build/os/centos/rhel6/compass/Dockerfile.tmpl @@ -11,12 +11,11 @@ RUN yum update -y RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf #set packages = $getVar('spcial_packages', []) #for package in $packages -ADD $packages /var/cache/yum/x86_64/7/base/packages/ +ADD ./RedHat/packages/$package /var/cache/yum/x86_64/6/base/packages/ #end for #set scripts = $getVar('scripts', []) -#set dir = $getVar('dir', ".") #for script in $scripts -ADD $dir/$script /tmp/chigang/$script +ADD ./RedHat/script/$script /tmp/chigang/$script RUN chmod +x /tmp/chigang/$script RUN /tmp/chigang/$script #end for diff --git a/build/os/centos/rhel7/juno/Dockerfile.tmpl b/build/os/centos/rhel7/juno/Dockerfile.tmpl index df5f41b4..d0d45ae4 100644 --- a/build/os/centos/rhel7/juno/Dockerfile.tmpl +++ b/build/os/centos/rhel7/juno/Dockerfile.tmpl @@ -8,12 +8,11 @@ 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 $packages /var/cache/yum/x86_64/7/base/packages/ +ADD ./RedHat/packages/$package /var/cache/yum/x86_64/7/base/packages/ #end for #set scripts = $getVar('scripts', []) -#set dir = $getVar('dir', ".") #for script in $scripts -ADD $dir/$script /tmp/chigang/$script +ADD ./RedHat/script/$script /tmp/chigang/$script RUN chmod +x /tmp/chigang/$script RUN /tmp/chigang/$script #end for diff --git a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl index 944fb154..d723b6e7 100644 --- a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl +++ b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl @@ -9,12 +9,11 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list RUN rm -f /etc/apt/apt.conf.d/docker-clean #set packages = $getVar('spcial_packages', []) #for package in $packages -ADD $packages /var/cache/apt/archives/ +ADD ./Debian/packages/$package /var/cache/apt/archives/ #end for #set scripts = $getVar('scripts', []) -#set dir = $getVar('dir', ".") #for script in $scripts -ADD $dir/$script /tmp/chigang/$script +ADD ./Debian/script/$script /tmp/chigang/$script RUN chmod +x /tmp/chigang/$script RUN /tmp/chigang/$script #end for diff --git a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl index 944fb154..d723b6e7 100644 --- a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl +++ b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl @@ -9,12 +9,11 @@ RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list RUN rm -f /etc/apt/apt.conf.d/docker-clean #set packages = $getVar('spcial_packages', []) #for package in $packages -ADD $packages /var/cache/apt/archives/ +ADD ./Debian/packages/$package /var/cache/apt/archives/ #end for #set scripts = $getVar('scripts', []) -#set dir = $getVar('dir', ".") #for script in $scripts -ADD $dir/$script /tmp/chigang/$script +ADD ./Debian/script/$script /tmp/chigang/$script RUN chmod +x /tmp/chigang/$script RUN /tmp/chigang/$script #end for -- cgit 1.2.3-korg