Skip to content

Avoid curl conflict with RHEL ubi in dockerfile helper #458

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.

Sign up for GitHub

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

Merged
Stromweld merged 3 commits into from
Jul 28, 2026
+5 −3
Merged

Avoid curl conflict with RHEL ubi in dockerfile helper #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f379288
Avoid curl conflicts
jblaine Jul 28, 2026
b751a2d
fix: solve rhel curl conflict
jblaine Jul 28, 2026
09f1674
Fix spec for rhel_platform changes
jblaine Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/kitchen/docker/helpers/dockerfile_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ def rhel_platform
<<-CODE
ENV container=docker
RUN yum clean all
RUN yum install -y sudo openssh-server openssh-clients which curl
RUN yum install -y sudo openssh-server openssh-clients which
RUN which curl || yum install -y curl
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
CODE
end
Expand Down
5 changes: 3 additions & 2 deletions spec/dockerfile_helper_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ def initialize(config = {})
expect(result).not_to include("--allowerasing")
end

it "installs required packages including curl" do
it "installs required packages including curl if needed" do
result = helper.rhel_platform
expect(result).to include("sudo openssh-server openssh-clients which curl")
expect(result).to include("sudo openssh-server openssh-clients which")
expect(result).to include("which curl || yum install -y curl")
end
end

Expand Down
Loading