From f52be4dc7c034949d5cb449e5156cad43ebd1dc9 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Thu, 24 Apr 2025 15:32:43 -0700 Subject: [PATCH] Buildfix: pin rspec-its; simplify podman install (resolves #597) - Pins rspec-its to 1.x - Removes unnecessary setup steps for Ubuntu 20.10+ from ./scripts/install_podman.sh --- docker-api.gemspec | 2 +- script/install_podman.sh | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/docker-api.gemspec b/docker-api.gemspec index 1a131c76..3d652824 100644 --- a/docker-api.gemspec +++ b/docker-api.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'multi_json' gem.add_development_dependency 'rake' gem.add_development_dependency 'rspec', '~> 3.0' - gem.add_development_dependency 'rspec-its' + gem.add_development_dependency 'rspec-its', '~> 1' gem.add_development_dependency 'pry' gem.add_development_dependency 'single_cov' gem.add_development_dependency 'webmock' diff --git a/script/install_podman.sh b/script/install_podman.sh index f5d48789..1e6d8543 100755 --- a/script/install_podman.sh +++ b/script/install_podman.sh @@ -1,12 +1,5 @@ #!/bin/sh set -ex -. /etc/os-release - -curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add - - -echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" > /etc/apt/sources.list.d/podman.list - apt-get update - apt-get install -y podman