sync modular container kickstarts to what was in the docker ones.

Remove the no longer needed docker kickstarts

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore
2017-09-27 09:30:08 -05:00
parent e9dd1a4e47
commit df800dcc2b
3 changed files with 14 additions and 151 deletions

View File

@@ -1,4 +1,4 @@
# This is the common bits between Fedora Container base image.
# This is the common bits between Container base images based on Modular Fedora.
#
# To keep this image minimal it only installs English language. You need to change
# dnf configuration in order to enable other languages.
@@ -8,12 +8,12 @@
# but you can run imagefactory locally too.
#
# To do so, testing local changes, first you'll need a TDL file. I store one here:
# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
#
# Then, once you have imagefactory and imagefactory-plugins installed, run:
#
# ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
# imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks container
# ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
# imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
#
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
@@ -32,6 +32,13 @@ autopart --noboot --nohome --noswap --nolvm
%packages --excludedocs --instLangs=en --nocore
fedora-modular-release
bash
coreutils-single
glibc-minimal-langpack
libcrypt
rpm
shadow-utils
sssd-client
util-linux
-kernel
-dosfstools
-e2fsprogs
@@ -54,8 +61,9 @@ set -eux
LANG="en_US"
echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "# fstab intentionally empty for containers" > /etc/fstab