docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix glob expansion for no-cache setting. 

On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.

This patch fixes to quote to work cache clean command properly.
This commit is contained in:
Tatsuki Sugiura 2013-12-23 17:27:22 +09:00
parent 1e5f9334e0
commit e3b878ce98
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mkimage-debootstrap.sh
View File

@ -144,9 +144,9 @@ if [ -z "$strictDebootstrap" ]; then
echo 'force-unsafe-io' | sudo tee etc/dpkg/dpkg.cfg.d/02apt-speedup > /dev/null echo 'force-unsafe-io' | sudo tee etc/dpkg/dpkg.cfg.d/02apt-speedup > /dev/null
# we want to effectively run "apt-get clean" after every install to keep images small (see output of "apt-get clean -s" for context) # we want to effectively run "apt-get clean" after every install to keep images small (see output of "apt-get clean -s" for context)
{ {
aptGetClean='rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true' aptGetClean='"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true";'
echo 'DPkg::Post-Invoke { "'$aptGetClean'"; };' echo "DPkg::Post-Invoke { ${aptGetClean} };"
echo 'APT::Update::Post-Invoke { "'$aptGetClean'"; };' echo "APT::Update::Post-Invoke { ${aptGetClean} };"
echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";'
} | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null } | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null
# and remove the translations, too # and remove the translations, too