From cc8bf8547661de527543f793ca8e35c4e8ac5033 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Mon, 27 Jan 2025 10:49:19 +0000 Subject: [PATCH] Remove curl-minimal Signed-off-by: Dan Webb --- .github/workflows/ci.yml | 2 +- resources/installation_script.rb | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d36b8bdf..78fd6d52e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/resources/installation_script.rb b/resources/installation_script.rb index a9c9ee069..43b8eb722 100644 --- a/resources/installation_script.rb +++ b/resources/installation_script.rb @@ -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"