Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the rocky-container-generic element #48

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

jovial
Copy link
Contributor

@jovial jovial commented Sep 1, 2022

This makes the rocky-container build more like the generic cloud
image, see:

https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks

@jovial jovial force-pushed the feature/rocky-container-generic branch from 0f55f4b to 90858e4 Compare September 1, 2022 10:18
@jovial jovial marked this pull request as draft September 1, 2022 10:23
@mnasiadka
Copy link
Member

So, cloud-init should use cloud-user, even for centos it should (because on RHEL8/9 it uses cloud-user) - it seems getting a ,,centos'' user is a bug (canonical/cloud-init#1639).
If we're missing any sane basic packages in the upstream Dockerfile - maybe let's add it there? (https://github.com/rocky-linux/sig-cloud-instance-images)

This makes the rocky-container build more like the generic cloud
image, see:

https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks
@jovial jovial force-pushed the feature/rocky-container-generic branch from 748f21e to c667705 Compare September 1, 2022 14:10
@jovial
Copy link
Contributor Author

jovial commented Sep 1, 2022

So, cloud-init should use cloud-user, even for centos it should (because on RHEL8/9 it uses cloud-user) - it seems getting a ,,centos'' user is a bug (canonical/cloud-init#1639). If we're missing any sane basic packages in the upstream Dockerfile - maybe let's add it there? (https://github.com/rocky-linux/sig-cloud-instance-images)

Interesting, I guess it makes sense to use the upstream default of cloud-user. It was just something @priteau brought up as the kayobe bootstrap user defaults to os_distribution. This matches what is configured in the generic cloud image:

https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks#L107-109

but not what you get when using rocky-container.

If we're missing any sane basic packages in the upstream Dockerfile - maybe let's add it there? (https://github.com/rocky-linux/sig-cloud-instance-images)

Some of these packages aren't really necessary in a container, but make sense when creating a bootable image from it. I Imagine they'd want to keep their base container clean.

@mnasiadka
Copy link
Member

So, cloud-init should use cloud-user, even for centos it should (because on RHEL8/9 it uses cloud-user) - it seems getting a ,,centos'' user is a bug (canonical/cloud-init#1639). If we're missing any sane basic packages in the upstream Dockerfile - maybe let's add it there? (https://github.com/rocky-linux/sig-cloud-instance-images)

Interesting, I guess it makes sense to use the upstream default of cloud-user. It was just something @priteau brought up as the kayobe bootstrap user defaults to os_distribution. This matches what is configured in the generic cloud image:

https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks#L107-109

but not what you get when using rocky-container.

If we're missing any sane basic packages in the upstream Dockerfile - maybe let's add it there? (https://github.com/rocky-linux/sig-cloud-instance-images)

Some of these packages aren't really necessary in a container, but make sense when creating a bootable image from it. I Imagine they'd want to keep their base container clean.

So then I guess it could be accepted in DIB's rocky-container element - or we can have it in our custom collection.

Can end up removing dependencies from other elements, so its porbbaly
best to keep this list minimal.
@jovial
Copy link
Contributor Author

jovial commented Sep 1, 2022

I noticed they are still setting cloud-user to rocky in the rocky 9 generic image:

https://git.rockylinux.org/rocky/kickstarts/-/blob/r9/Rocky-9-GenericCloud.ks#L107-109

@jovial
Copy link
Contributor Author

jovial commented Sep 1, 2022

I've submitted upstream here: https://review.opendev.org/c/openstack/diskimage-builder/+/855521. Awaiting feedback.

Copy link

@markgoddard markgoddard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable

@jovial jovial marked this pull request as ready for review October 13, 2022 15:11
@sjpb
Copy link

sjpb commented Nov 2, 2022

Having booted a genericcloud8.6 image, /etc/cloud/cloud.cfg only defines a rocky user:

[root@demo-control rocky]# grep name: /etc/cloud/cloud.cfg
    name: rocky
  ssh_svcname: sshd
[root@demo-control rocky]# cat /etc/redhat-release 
Rocky Linux release 8.6 (Green Obsidian)

@sjpb sjpb self-requested a review November 2, 2022 14:06
@sjpb
Copy link

sjpb commented Nov 2, 2022

@jovial there's quite a lot of package changes - obviously lots are just updates which is wanted/as-expected, don't know if you want to address any added/removed ones:

- CHANGED NetworkManager ['1.36.0-7.el8_6'] ['1.36.0-9.el8_6']
- CHANGED NetworkManager-libnm ['1.36.0-7.el8_6'] ['1.36.0-9.el8_6']
- CHANGED NetworkManager-team ['1.36.0-7.el8_6'] ['1.36.0-9.el8_6']
- CHANGED NetworkManager-tui ['1.36.0-7.el8_6'] ['1.36.0-9.el8_6']
- REMOVED PackageKit ['1.1.12-6.el8.0.2']
- REMOVED PackageKit-glib ['1.1.12-6.el8.0.2']
- REMOVED abattis-cantarell-fonts ['0.0.25-6.el8']
- REMOVED authselect-compat ['1.2.2-3.el8']
- CHANGED bash ['4.4.20-3.el8'] ['4.4.20-4.el8_6']
- CHANGED bind-export-libs ['9.11.36-3.el8'] ['9.11.36-3.el8_6.1']
- ADDED binutils ['2.30-113.el8']
- ADDED biosdevname ['0.7.3-2.el8']
- REMOVED brotli ['1.0.6-3.el8']
- REMOVED bzip2 ['1.0.6-26.el8']
- CHANGED ca-certificates ['2021.2.50-80.0.el8_4'] ['2022.2.54-80.2.el8_6']
- REMOVED cairo ['1.15.12-6.el8']
- REMOVED cairo-gobject ['1.15.12-6.el8']
- CHANGED chrony ['4.1-1.el8'] ['4.1-1.el8.rocky.0.1']
- REMOVED cockpit-bridge ['264.1-1.el8']
- REMOVED cockpit-system ['264.1-1.el8']
- REMOVED cockpit-ws ['264.1-1.el8']
- REMOVED crypto-policies-scripts ['20211116-1.gitae470d6.el8']
- CHANGED curl ['7.61.1-22.el8_6.3'] ['7.61.1-22.el8_6.4']
- CHANGED dbus ['1.12.8-18.el8'] ['1.12.8-18.el8_6.1']
- CHANGED dbus-common ['1.12.8-18.el8'] ['1.12.8-18.el8_6.1']
- CHANGED dbus-daemon ['1.12.8-18.el8'] ['1.12.8-18.el8_6.1']
- CHANGED dbus-libs ['1.12.8-18.el8'] ['1.12.8-18.el8_6.1']
- CHANGED dbus-tools ['1.12.8-18.el8'] ['1.12.8-18.el8_6.1']
- REMOVED dejavu-fonts-common ['2.35-7.el8']
- REMOVED dejavu-sans-mono-fonts ['2.35-7.el8']
- CHANGED device-mapper ['1.02.181-3.el8'] ['1.02.181-3.el8_6.2']
- CHANGED device-mapper-libs ['1.02.181-3.el8'] ['1.02.181-3.el8_6.2']
- ADDED dwz ['0.12-10.el8']
- ADDED efi-srpm-macros ['3-3.el8']
- REMOVED elfutils-debuginfod-client ['0.186-1.el8']
- CHANGED expat ['2.2.5-8.el8_6.2'] ['2.2.5-8.el8_6.3']
- ADDED firewalld ['0.9.3-13.el8']
- ADDED firewalld-filesystem ['0.9.3-13.el8']
- REMOVED fontconfig ['2.13.1-4.el8']
- REMOVED fontpackages-filesystem ['1.44-22.el8']
- REMOVED gdk-pixbuf2 ['2.36.12-5.el8']
- ADDED ghc-srpm-macros ['1.4.2-7.el8']
- ADDED git-core ['2.31.1-2.el8']
- REMOVED glib-networking ['2.56.1-1.1.el8']
- CHANGED glib2 ['2.56.4-158.el8'] ['2.56.4-158.el8_6.1']
- CHANGED glibc ['2.28-189.1.el8'] ['2.28-189.5.el8_6']
- REMOVED glibc-all-langpacks ['2.28-189.1.el8']
- CHANGED glibc-common ['2.28-189.1.el8'] ['2.28-189.5.el8_6']
- CHANGED glibc-gconv-extra ['2.28-189.1.el8'] ['2.28-189.5.el8_6']
- ADDED glibc-minimal-langpack ['2.28-189.5.el8_6']
- CHANGED gnupg2 ['2.2.20-2.el8'] ['2.2.20-3.el8_6']
- CHANGED gnupg2-smime ['2.2.20-2.el8'] ['2.2.20-3.el8_6']
- CHANGED gnutls ['3.6.16-4.el8'] ['3.6.16-5.el8_6']
- ADDED go-srpm-macros ['2-17.el8']
- ADDED gpg-pubkey ['6d745a60-60287f36']
- CHANGED grub2-common ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- CHANGED grub2-pc ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- CHANGED grub2-pc-modules ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- CHANGED grub2-tools ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- CHANGED grub2-tools-extra ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- CHANGED grub2-tools-minimal ['2.02-123.el8_6.8.rocky.0.1'] ['2.02-123.el8_6.8.rocky.0.2']
- REMOVED gsettings-desktop-schemas ['3.32.0-6.el8']
- CHANGED initscripts ['10.00.17-1.el8'] ['10.00.17-1.el8_6.2']
- CHANGED iproute ['5.15.0-4.el8'] ['5.15.0-4.el8_6.1']
- ADDED iprutils ['2.4.19-1.el8']
- ADDED ipset ['7.1-1.el8']
- ADDED ipset-libs ['7.1-1.el8']
- ADDED iptables ['1.8.4-22.el8']
- ADDED iptables-ebtables ['1.8.4-22.el8']
- ADDED iptables-libs ['1.8.4-22.el8']
- ADDED iscsi-initiator-utils ['6.2.1.4-4.git095f59c.el8']
- ADDED iscsi-initiator-utils-iscsiuio ['6.2.1.4-4.git095f59c.el8']
- ADDED isns-utils-libs ['0.99-1.el8']
- REMOVED json-glib ['1.4.4-1.el8']
- CHANGED kernel ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- CHANGED kernel-core ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- CHANGED kernel-modules ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- CHANGED kernel-tools ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- CHANGED kernel-tools-libs ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- CHANGED kpartx ['0.8.4-22.el8'] ['0.8.4-22.el8_6.2']
- ADDED langpacks-en ['1.0-12.el8']
- REMOVED libX11 ['1.6.8-5.el8']
- REMOVED libX11-common ['1.6.8-5.el8']
- REMOVED libXau ['1.0.9-3.el8']
- REMOVED libXext ['1.3.4-1.el8']
- REMOVED libXrender ['0.9.10-7.el8']
- REMOVED libappstream-glib ['0.7.14-3.el8']
- REMOVED libcurl ['7.61.1-22.el8_6.3']
- ADDED libcurl-minimal ['7.61.1-22.el8_6.4']
- CHANGED libdnf ['0.63.0-8.el8'] ['0.63.0-8.2.el8_6']
- ADDED libibverbs ['37.2-1.el8']
- CHANGED libksba ['1.3.5-7.el8'] ['1.3.5-8.el8_6']
- REMOVED libmodman ['2.0.1-17.el8']
- ADDED libnetfilter_conntrack ['1.0.6-5.el8']
- ADDED libnfnetlink ['1.0.1-13.el8']
- ADDED libnftnl ['1.1.5-5.el8']
- ADDED libpcap ['1.9.1-5.el8']
- REMOVED libproxy ['0.4.15-5.2.el8']
- REMOVED libpsl ['0.20.2-6.el8']
- CHANGED libsemanage ['2.9-8.el8'] ['2.9-9.el8_6']
- REMOVED libsoup ['2.62.3-2.el8']
- REMOVED libssh ['0.9.6-3.el8']
- REMOVED libssh-config ['0.9.6-3.el8']
- REMOVED libstemmer ['0-10.585svn.el8']
- REMOVED libxcb ['1.13.1-1.el8']
- ADDED lsof ['4.93.2-1.el8']
- ADDED man-pages ['4.15-7.el8']
- ADDED man-pages-overrides ['8.6.0.0-1.el8']
- CHANGED microcode_ctl ['20220207-1.el8'] ['20220207-1.20220510.1.el8_6']
- ADDED nftables ['0.9.3-25.el8']
- ADDED ocaml-srpm-macros ['5-4.el8']
- REMOVED oddjob ['0.34.7-1.el8']
- REMOVED oddjob-mkhomedir ['0.34.7-1.el8']
- ADDED openblas-srpm-macros ['2-2.el8']
- CHANGED openssl ['1.1.1k-6.el8_5'] ['1.1.1k-7.el8_6']
- CHANGED openssl-libs ['1.1.1k-6.el8_5'] ['1.1.1k-7.el8_6']
- CHANGED pam ['1.3.1-16.el8'] ['1.3.1-16.el8_6.1']
- CHANGED pcre2 ['10.32-2.el8'] ['10.32-3.el8_6']
- ADDED perl-srpm-macros ['1-25.el8']
- REMOVED pixman ['0.38.4-2.el8']
- CHANGED platform-python ['3.6.8-45.el8.rocky.0'] ['3.6.8-47.el8_6.rocky.0']
- REMOVED publicsuffix-list-dafsa ['20180723-1.el8']
- ADDED python-rpm-macros ['3-41.el8']
- ADDED python-srpm-macros ['3-41.el8']
- REMOVED python3-cairo ['1.16.3-6.el8']
- ADDED python3-decorator ['4.2.1-2.el8']
- ADDED python3-firewall ['0.9.3-13.el8']
- REMOVED python3-gobject ['3.28.3-2.el8']
- CHANGED python3-hawkey ['0.63.0-8.el8'] ['0.63.0-8.2.el8_6']
- CHANGED python3-libdnf ['0.63.0-8.el8'] ['0.63.0-8.2.el8_6']
- CHANGED python3-libs ['3.6.8-45.el8.rocky.0'] ['3.6.8-47.el8_6.rocky.0']
- CHANGED python3-libsemanage ['2.9-8.el8'] ['2.9-9.el8_6']
- REMOVED python3-libxml2 ['2.9.7-13.el8_6.1']
- ADDED python3-nftables ['0.9.3-25.el8']
- CHANGED python3-perf ['4.18.0-372.13.1.el8_6'] ['4.18.0-372.32.1.el8_6']
- REMOVED python3-pexpect ['4.3.1-3.el8']
- ADDED python3-pip ['9.0.3-22.el8.rocky.0']
- REMOVED python3-ptyprocess ['0.5.2-4.el8']
- REMOVED python3-pydbus ['0.6.0-5.el8']
- CHANGED python3-rpm ['4.14.3-23.el8'] ['4.14.3-24.el8_6']
- ADDED python3-rpm-macros ['3-41.el8']
- ADDED python3-setuptools ['39.2.0-6.el8']
- ADDED python3-slip ['0.6.4-11.el8']
- ADDED python3-slip-dbus ['0.6.4-11.el8']
- REMOVED python3-systemd ['234-8.el8']
- REMOVED python3-unbound ['1.7.3-17.el8']
- ADDED python36 ['3.6.8-38.module+el8.5.0+671+195e4563']
- CHANGED qemu-guest-agent ['6.2.0-11.module+el8.6.0+847+b490afdd'] ['6.2.0-11.module+el8.6.0+1052+ff61d164.6']
- ADDED qt5-srpm-macros ['5.15.2-1.el8.0.1']
- ADDED redhat-rpm-config ['129-1.el8']
- CHANGED rng-tools ['6.14-4.git.b2b7934e.el8'] ['6.14-6.git.b2b7934e.el8_6']
- CHANGED rocky-gpg-keys ['8.6-3.el8'] ['8.6-4.el8']
- REMOVED rocky-logos ['85.0-4.el8']
- CHANGED rocky-release ['8.6-3.el8'] ['8.6-4.el8']
- CHANGED rocky-repos ['8.6-3.el8'] ['8.6-4.el8']
- CHANGED rpm ['4.14.3-23.el8'] ['4.14.3-24.el8_6']
- CHANGED rpm-build-libs ['4.14.3-23.el8'] ['4.14.3-24.el8_6']
- CHANGED rpm-libs ['4.14.3-23.el8'] ['4.14.3-24.el8_6']
- CHANGED rpm-plugin-selinux ['4.14.3-23.el8'] ['4.14.3-24.el8_6']
- REMOVED rpm-plugin-systemd-inhibit ['4.14.3-23.el8']
- CHANGED rsync ['3.1.3-14.el8_6.2'] ['3.1.3-14.el8_6.3']
- ADDED rust-srpm-macros ['5-2.el8']
- CHANGED selinux-policy ['3.14.3-95.el8'] ['3.14.3-95.el8_6.4']
- CHANGED selinux-policy-targeted ['3.14.3-95.el8'] ['3.14.3-95.el8_6.4']
- REMOVED setroubleshoot-plugins ['3.3.14-1.el8']
- REMOVED setroubleshoot-server ['3.3.26-3.el8']
- REMOVED sos ['4.2-19.el8_6']
- CHANGED sqlite-libs ['3.26.0-15.el8'] ['3.26.0-16.el8_6']
- REMOVED sscg ['2.3.3-14.el8']
- CHANGED systemd ['239-58.el8'] ['239-58.el8_6.8']
- CHANGED systemd-libs ['239-58.el8'] ['239-58.el8_6.8']
- CHANGED systemd-pam ['239-58.el8'] ['239-58.el8_6.8']
- CHANGED systemd-udev ['239-58.el8'] ['239-58.el8_6.8']
- ADDED tcpdump ['4.9.3-3.el8']
- ADDED traceroute ['2.1.0-6.el8']
- CHANGED tuned ['2.18.0-2.el8'] ['2.18.0-2.el8_6.1']
- CHANGED tzdata ['2022a-1.el8'] ['2022e-1.el8']
- REMOVED unbound-libs ['1.7.3-17.el8']
- ADDED unzip ['6.0-46.el8']
- CHANGED vim-minimal ['8.0.1763-19.el8_6.2'] ['8.0.1763-19.el8_6.4']
- ADDED zip ['3.0-23.el8']
- CHANGED zlib ['1.2.11-18.el8_5'] ['1.2.11-19.el8_6']

@sjpb
Copy link

sjpb commented Nov 2, 2022

The above just used Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2 as the "old" side of the diff, with no yum update or anything.

@@ -0,0 +1,3 @@
rocky-container
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this also depend on vm? Without it you get an error "element block_device not found"

@@ -0,0 +1,73 @@
# List taken from https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment #48 (comment)

Copy link

@sjpb sjpb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also - it should include a README, probably based on the rocky-container README.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants