Repository navigation
feat: unionize Ubuntu Containerfile with the one for Alpine - #141
Merged
Merged
Conversation
Signed-off-by: Robert Waffen <rw@betadots.de> Co-authored-by: ChatGPT Codex <codex@openai.com>
bastelfreak
previously approved these changes
Jun 12, 2026
Member
Author
|
I would like to have this PR a bit longer open, so that people might discuss or have opinions... like in #124 |
rwaffen
marked this pull request as draft
June 12, 2026 14:34
miharp
reviewed
Jun 16, 2026
miharp
reviewed
Jun 16, 2026
Signed-off-by: Robert Waffen <rw@betadots.de>
Signed-off-by: Robert Waffen <rw@betadots.de>
rwaffen
marked this pull request as ready for review
June 16, 2026 12:49
Signed-off-by: Robert Waffen <rw@betadots.de>
miharp
reviewed
Jun 16, 2026
Signed-off-by: Robert Waffen <rw@betadots.de>
bastelfreak
approved these changes
Jun 17, 2026
This was referenced Jun 21, 2026
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
…penVoxProject#148) Since OpenVoxProject#141, gems installed by prep_release_container.sh land in the system CRuby gem path (e.g. /var/lib/gems/3.x), which is not on puppetserver's JRuby gem-path. As a result hiera-eyaml was invisible to puppetserver and eyaml-encrypted Hiera lookups failed at runtime. Install the gems puppetserver's JRuby loads at runtime (hiera-eyaml, hocon, openvoxserver-ca) into the JRuby gem-home via `puppetserver gem install`, alongside the existing openvox install. Split the two gem paths by consumer to avoid redundant installs: - CRuby (distro Ruby) gets only the gems backing CLI tools run inside the container: openvox (puppet/facter, e.g. `puppet config print`), hiera-eyaml (eyaml symlink), r10k and its native rugged dependency, plus racc/syslog as Ruby 3.4+ stdlib replacements. These run fast under CRuby; JRuby binstubs would pay JVM start-up per call and are not on PATH anyway. - JRuby gets the gems the server loads at runtime: openvox, hiera-eyaml, and hocon/openvoxserver-ca (which back `puppetserver ca`). openvox and hiera-eyaml are needed by both runtimes so are installed in both; hocon and openvoxserver-ca have no CRuby consumer and are now JRuby-only, removing the previous duplicate system installs. r10k/rugged stay CRuby-only. Fixes OpenVoxProject#148 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
…roject#148) Since OpenVoxProject#141, gems installed by prep_release_container.sh land in the system CRuby gem path (e.g. /var/lib/gems/3.x), which is not on puppetserver's JRuby gem-path. As a result hiera-eyaml was invisible to the puppetserver JVM and eyaml-encrypted Hiera lookups failed during catalog compilation. Install hiera-eyaml into the JRuby gem-home via `puppetserver gem install`, alongside the existing openvox install. These two gems are the only ones the puppetserver JVM loads at runtime. All other gems stay in the system CRuby gem path, where they are needed: they back tools that run under the distro Ruby, not the JVM. In particular `puppetserver ca` runs the cli/apps/ca app under /opt/puppetlabs/puppet/bin/ruby (the distro Ruby), so openvoxserver-ca and its hocon dependency must remain on the CRuby path; r10k/rugged and the puppet/facter/eyaml CLIs likewise. Fixes OpenVoxProject#148 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
…roject#148) Since OpenVoxProject#141, gems installed by prep_release_container.sh land in the system CRuby gem path (e.g. /var/lib/gems/3.x), which is not on puppetserver's JRuby gem-path. As a result hiera-eyaml was invisible to the puppetserver JVM and eyaml-encrypted Hiera lookups failed during catalog compilation. Install hiera-eyaml into the JRuby gem-home via `puppetserver gem install`, alongside the existing openvox install. These two gems are the only ones the puppetserver JVM loads at runtime, and hiera-eyaml has no other consumer, so it is no longer installed under the distro Ruby at all. The `eyaml` CLI is exposed via a thin wrapper that runs through `puppetserver ruby` (a plain symlink would resolve the gem against the distro gem path, where it no longer lives); the CLI is effectively never used in-container, so the per-call JVM start-up is acceptable. All other gems stay in the system CRuby gem path, where they are needed: they back tools that run under the distro Ruby, not the JVM. In particular `puppetserver ca` runs the cli/apps/ca app under /opt/puppetlabs/puppet/bin/ruby (the distro Ruby), so openvoxserver-ca and its hocon dependency must remain on the CRuby path; r10k/rugged and the puppet/facter CLIs likewise. Fixes OpenVoxProject#148 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
…roject#148) Since OpenVoxProject#141, gems installed by prep_release_container.sh land in the system CRuby gem path (e.g. /var/lib/gems/3.x), which is not on puppetserver's JRuby gem-path. As a result hiera-eyaml was invisible to the puppetserver JVM and eyaml-encrypted Hiera lookups failed during catalog compilation. Install hiera-eyaml into the JRuby gem-home via `puppetserver gem install`, alongside the existing openvox install. These two gems are the only ones the puppetserver JVM loads at runtime, and hiera-eyaml has no other consumer, so it is no longer installed under the distro Ruby at all. The `eyaml` CLI is exposed via a thin wrapper that runs the JRuby gem-home binstub under the distro Ruby with GEM_PATH pointed at the JRuby gem-home (hiera-eyaml is a pure-Ruby gem, so it loads fine there); a plain symlink would resolve the gem against the distro gem path, where it no longer lives. All other gems stay in the system CRuby gem path, where they are needed: they back tools that run under the distro Ruby, not the JVM. In particular `puppetserver ca` runs the cli/apps/ca app under /opt/puppetlabs/puppet/bin/ruby (the distro Ruby), so openvoxserver-ca and its hocon dependency must remain on the CRuby path; r10k/rugged and the puppet/facter CLIs likewise. Fixes OpenVoxProject#148 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
…roject#148) Since OpenVoxProject#141, gems installed by prep_release_container.sh land in the system CRuby gem path (e.g. /var/lib/gems/3.x), which is not on puppetserver's JRuby gem-path. As a result hiera-eyaml was invisible to the puppetserver JVM and eyaml-encrypted Hiera lookups failed during catalog compilation. Install hiera-eyaml into the JRuby gem-home via `puppetserver gem install`, alongside the existing openvox install. These two gems are the only ones the puppetserver JVM loads at runtime, and hiera-eyaml has no other consumer, so it is no longer installed under the distro Ruby at all. The `eyaml` CLI is exposed via a thin wrapper that runs the JRuby gem-home binstub under the distro Ruby with GEM_PATH pointed at the JRuby gem-home (hiera-eyaml is a pure-Ruby gem, so it loads fine there); a plain symlink would resolve the gem against the distro gem path, where it no longer lives. All other gems stay in the system CRuby gem path, where they are needed: they back tools that run under the distro Ruby, not the JVM. In particular `puppetserver ca` runs the cli/apps/ca app under /opt/puppetlabs/puppet/bin/ruby (the distro Ruby), so openvoxserver-ca and its hocon dependency must remain on the CRuby path; r10k/rugged and the puppet/facter CLIs likewise. Fixes OpenVoxProject#148 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Chris Boot <bootc@boo.tc>
bootc
added a commit
to bootc/container-openvoxserver
that referenced
this pull request
Jun 26, 2026
Colocate the puppetdb termini with the openvox gem lib so Puppet's Pops system loader finds puppetdb_query during compilation. Since OpenVoxProject#141 the images gem-install openvox instead of using the OS packages, so the termini in vendor_ruby are no longer on the loader's root. Fixes OpenVoxProject#159. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Chris Boot <bootc@boo.tc>
4 of 8 tasks
1 task done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Short description
unionize Ubuntu Containfile with the one for Alpine. One step more to rootless containers. One step more to only one container file again.
Checklist
I have:
Signed-off-byannotation to each of my commitsGenerated-byorAssisted-byannotations to each of my commits created with the help of an AI agent