From d9885abdc4a7e028092fc18715b69075bb7c2f8d Mon Sep 17 00:00:00 2001 From: Sam Bailey Date: Tue, 3 Jun 2014 20:41:32 +1000 Subject: [PATCH] reuse the febootstrap-minimize from rinse Docker-DCO-1.1-Signed-off-by: Sam Bailey (github: thatsamguy) --- contrib/mkimage/.febootstrap-minimize | 2 +- contrib/mkimage/mageia-urpmi | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/contrib/mkimage/.febootstrap-minimize b/contrib/mkimage/.febootstrap-minimize index 7dab4eb8b5..8a71f5ed67 100755 --- a/contrib/mkimage/.febootstrap-minimize +++ b/contrib/mkimage/.febootstrap-minimize @@ -13,7 +13,7 @@ shift # docs rm -rf usr/share/{man,doc,info,gnome/help} # cracklib - #rm -rf usr/share/cracklib + rm -rf usr/share/cracklib # i18n rm -rf usr/share/i18n # yum cache diff --git a/contrib/mkimage/mageia-urpmi b/contrib/mkimage/mageia-urpmi index 252e827877..93fb289cac 100755 --- a/contrib/mkimage/mageia-urpmi +++ b/contrib/mkimage/mageia-urpmi @@ -53,25 +53,7 @@ fi --root "$rootfsDir" ) -( - # Clean cruft to reduce image size - stolen and modifed from .febootstrap-minimize - set -x - cd "$rootfsDir" - # locales - rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive} - # docs - rm -rf usr/share/{man,doc,info,gnome/help} - # cracklib - rm -rf usr/share/cracklib - # i18n - rm -rf usr/share/i18n - # sln - rm -rf sbin/sln - # ldconfig - #rm -rf sbin/ldconfig - rm -rf etc/ld.so.cache var/cache/ldconfig - mkdir -p --mode=0755 var/cache/ldconfig -) +"$(dirname "$BASH_SOURCE")/.febootstrap-minimize" "$rootfsDir" if [ -d "$rootfsDir/etc/sysconfig" ]; then # allow networking init scripts inside the container to work without extra steps