diff options
| author |   Justin chi <chigang@huawei.com> | 2015-09-17 11:07:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-17 11:07:13 +0000 |
| commit | 1bdbd85b6def38c5871a7806a1412385b80ee326 (patch) | |
| tree | 9107d0b6a31d5c09620c3ac8ca65baf8b9c33c86 /build/os/centos | |
| parent | e784578ee4f155f195506b10cf32f781b39be56c (diff) | |
| parent | 4265a1ec3817d137332f6a771bbbef0eaee5879c (diff) | |
Merge "Add parameter allows users to add their own package or scripts of making package to ISO file"
Diffstat (limited to 'build/os/centos')
| -rw-r--r-- | build/os/centos/rhel6/compass/Dockerfile.tmpl | 5 | ||||
| -rw-r--r-- | build/os/centos/rhel7/juno/Dockerfile.tmpl | 5 |
2 files changed, 4 insertions, 6 deletions
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) <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 $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 |