Skip to content

Commit

Permalink
Remove curl-minimal
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Webb <[email protected]>
  • Loading branch information
damacus committed Jan 27, 2025
1 parent fd86c8d commit cc8bf85
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Test Kitchen
uses: ./.github/actions/test-kitchen
with:
kitchen-local-yaml: kitchen.dokken.yml
kitchen-yaml: kitchen.dokken.yml
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
license-id: ${{ secrets.CHEF_LICENSE_KEY }}
Expand Down
13 changes: 12 additions & 1 deletion resources/installation_script.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,18 @@ def default_script_url
#########

action :create do
package 'curl'
# Handle the curl-minimal to curl transition on RHEL-based systems
if platform_family?('rhel', 'fedora')
package 'curl-minimal' do
action :remove
end

package 'curl' do
options '--allowerasing'
end
else
package 'curl'
end

execute 'install docker' do
command "curl -sSL #{new_resource.script_url} | sh"
Expand Down

0 comments on commit cc8bf85

Please sign in to comment.