docker-min: merge pruning commands

Merge pruning commands. Don't rm /etc/machine-id or /run/ because we
just ran commands to touch /etc/machine-id and /run/lock
This commit is contained in:
Dusty Mabe 2017-01-19 22:30:39 -05:00
parent 8ce607a7ef
commit ee367f90b0
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -52,10 +52,6 @@ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
echo "# fstab intentionally empty for containers" > /etc/fstab
# remove some extraneous files
rm -rf /var/cache/dnf/*
rm -rf /tmp/*
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in docker
# This unmounts /run (tmpfs) and then recreates the files
@ -88,6 +84,6 @@ rm usr/sbin/{glibc_post_upgrade.x86_64,sln}
ln usr/bin/ln usr/sbin/sln
# Final pruning
rm -rf etc/machine-id var/cache/* var/log/* run/* tmp/*
rm -rf var/cache/* var/log/* tmp/*
%end