Skip to content
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.

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

Update all components to the latest #1470

Merged
merged 2 commits into from
Sep 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ group(:omnibus_package) do
gem "kitchen-ec2", ">= 3.6"
gem "kitchen-digitalocean", ">= 0.11"
gem "kitchen-dokken", ">= 2.9"
# docker-api appears to be unmaintained, and has a noisy deprecation
# warning under ruby 2.7. Using a fork via an omnibus software def.
# Must use the software def because the ruby cleanup deletes the
# bundled gem. Chef Infra Client does not have this issue with Ohai
# and I do not understand why.
gem "docker-api" # , git: "https://github.com/chef/docker-api.git", branch: "master"
gem "docker-api", ">= 2.0" # make sure we get the Ruby 2.7 compatible release
gem "kitchen-google", ">= 2.0.0"
gem "kitchen-hyperv", ">= 0.5.1"
gem "kitchen-inspec", ">= 2.0"
Expand Down
64 changes: 32 additions & 32 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.4.3)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -14,7 +14,7 @@ GEM
artifactory (3.0.15)
ast (2.4.1)
aws-eventstream (1.1.0)
aws-partitions (1.365.0)
aws-partitions (1.368.0)
aws-sdk-apigateway (1.51.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
Expand All @@ -33,7 +33,7 @@ GEM
aws-sdk-cloudformation (1.42.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.39.0)
aws-sdk-cloudfront (1.40.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.25.0)
Expand Down Expand Up @@ -140,7 +140,7 @@ GEM
aws-sdk-route53resolver (1.19.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.79.1)
aws-sdk-s3 (1.80.0)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -352,7 +352,7 @@ GEM
concurrent-ruby (1.1.7)
cookbook-omnifetch (0.11.1)
mixlib-archive (>= 0.4, < 2.0)
cookstyle (6.16.10)
cookstyle (6.17.5)
rubocop (= 0.90.0)
debug_inspector (0.0.3)
declarative (0.0.20)
Expand All @@ -364,7 +364,7 @@ GEM
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.3)
docker-api (1.34.2)
docker-api (2.0.0)
excon (>= 0.47.0)
multi_json
domain_name (0.5.20190701)
Expand Down Expand Up @@ -400,7 +400,7 @@ GEM
ffi-rzmq-core (>= 1.0.7)
ffi-rzmq-core (1.0.7)
ffi
ffi-win32-extensions (1.0.3)
ffi-win32-extensions (1.0.4)
ffi
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
Expand Down Expand Up @@ -428,21 +428,21 @@ GEM
fuzzyurl (0.9.0)
gcewinpass (1.1.0)
google-api-client (~> 0.13)
google-api-client (0.34.1)
google-api-client (0.35.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
googleauth (0.10.0)
faraday (~> 0.12)
googleauth (0.13.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.12)
signet (~> 0.14)
gssapi (1.3.0)
ffi (>= 1.0.1)
guard (2.16.2)
Expand All @@ -467,22 +467,22 @@ GEM
ice_nine (0.11.2)
inifile (3.0.0)
iniparse (1.5.0)
inspec (4.22.22)
inspec (4.23.4)
faraday_middleware (~> 0.12.2)
inspec-core (= 4.22.22)
inspec-core (= 4.23.4)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-bin (4.22.22)
inspec (= 4.22.22)
inspec-core (4.22.22)
inspec-bin (4.23.4)
inspec (= 4.23.4)
inspec-core (4.23.4)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json_schemer (>= 0.2.1, < 0.2.12)
license-acceptance (>= 0.2.13, < 2.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
Expand Down Expand Up @@ -510,7 +510,7 @@ GEM
uri_template (~> 0.7)
jwt (2.2.2)
kartograph (0.2.8)
kitchen-azurerm (1.2.0)
kitchen-azurerm (1.3.0)
azure_mgmt_network (~> 0.18, >= 0.18.2)
azure_mgmt_resources (~> 0.17, >= 0.17.2)
inifile (~> 3.0, >= 3.0.0)
Expand All @@ -519,8 +519,8 @@ GEM
kitchen-digitalocean (0.11.1)
droplet_kit (>= 3.7, < 4.0)
test-kitchen (>= 1.17, < 3)
kitchen-dokken (2.10.0)
docker-api (~> 1.33)
kitchen-dokken (2.11.0)
docker-api (>= 1.33, < 3)
lockfile (~> 2.1)
test-kitchen (>= 1.15, < 3)
kitchen-ec2 (3.7.1)
Expand Down Expand Up @@ -638,9 +638,9 @@ GEM
mixlib-versioning
thor
mixlib-log (3.0.9)
mixlib-shellout (3.1.4)
mixlib-shellout (3.1.6)
chef-utils
mixlib-shellout (3.1.4-universal-mingw32)
mixlib-shellout (3.1.6-universal-mingw32)
chef-utils
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
Expand Down Expand Up @@ -683,7 +683,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (16.4.12)
ohai (16.5.0)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
Expand Down Expand Up @@ -776,7 +776,7 @@ GEM
rubocop-ast (>= 0.3.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
rubocop-ast (0.4.0)
parser (>= 2.7.1.4)
ruby-prof (1.4.1)
ruby-prof (1.4.1-x64-mingw32)
Expand Down Expand Up @@ -830,18 +830,18 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.9)
train (3.3.16)
train (3.3.21)
activesupport (>= 5.2.4.3, < 6.0.0)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
azure_mgmt_resources (~> 0.15)
azure_mgmt_security (~> 0.18)
azure_mgmt_storage (~> 0.18)
docker-api (~> 1.26)
google-api-client (>= 0.23.9, < 0.35.0)
googleauth (>= 0.6.6, < 0.11.0)
docker-api (>= 1.26, < 3.0)
google-api-client (>= 0.23.9, < 0.44.1)
googleauth (>= 0.6.6, < 0.13.1)
inifile (~> 3.0)
train-core (= 3.3.16)
train-core (= 3.3.21)
train-winrm (~> 0.2)
train-aws (0.1.17)
aws-sdk-apigateway (~> 1.0)
Expand Down Expand Up @@ -892,7 +892,7 @@ GEM
aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1.0)
train-core (3.3.16)
train-core (3.3.21)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
Expand Down Expand Up @@ -1005,7 +1005,7 @@ GEM
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-elevated (1.2.1)
winrm-elevated (1.2.2)
erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
Expand Down Expand Up @@ -1039,7 +1039,7 @@ DEPENDENCIES
cookstyle (~> 6.8)
dep-selector-libgecode
dep_selector
docker-api
docker-api (>= 2.0)
ed25519
fauxhai-ng (~> 8)
ffi-libarchive
Expand Down
16 changes: 8 additions & 8 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
aws-partitions (1.365.0)
aws-partitions (1.368.0)
aws-sdk-core (3.105.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand All @@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.37.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.79.1)
aws-sdk-s3 (1.80.0)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -176,7 +176,7 @@ GEM
ffi (1.13.1-x86-mingw32)
ffi-libarchive (1.0.4)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
ffi-win32-extensions (1.0.4)
ffi
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
Expand Down Expand Up @@ -224,9 +224,9 @@ GEM
mixlib-versioning
thor
mixlib-log (3.0.9)
mixlib-shellout (3.1.4)
mixlib-shellout (3.1.6)
chef-utils
mixlib-shellout (3.1.4-universal-mingw32)
mixlib-shellout (3.1.6-universal-mingw32)
chef-utils
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
Expand All @@ -248,7 +248,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (16.4.12)
ohai (16.5.0)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
Expand Down Expand Up @@ -366,11 +366,11 @@ GEM
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-elevated (1.2.1)
winrm-elevated (1.2.2)
erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.3.4)
winrm-fs (1.3.5)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 2.0)
Expand Down
38 changes: 0 additions & 38 deletions omnibus/config/software/docker-api.rb

This file was deleted.

6 changes: 0 additions & 6 deletions omnibus/config/software/gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
# @todo Contact gem mainter about getting new release.
dependency "rb-fsevent-gem" if mac_os_x?

# The docker-api gem has not been maintained so we are building and installing
# a fork of it. If the maintainer releases a fix with our change we can switch
# back to just installing it. The docker-api gem is required by kitchen-dokken
# in its gemspec.
dependency "docker-api"

build do
env = with_standard_compiler_flags(with_embedded_path)

Expand Down