summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-23 17:16:50 -0700
committerTim Smith <tsmith@chef.io>2019-04-23 17:17:44 -0700
commitb43a79754727dd14710eb48fce0f4e6d242375e5 (patch)
tree53281f08ce60d085ba0dacd7944088bfc8307952
parent8430221ba42c930c04fa46245fdfeb2309783891 (diff)
downloadchef-b43a79754727dd14710eb48fce0f4e6d242375e5.tar.gz
Move ed25519 gems into omnibused25519
We had to move this out of train as they were causing installation failures for inspec. This change makes sure we get them into our omnibus package. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
-rw-r--r--omnibus/Gemfile.lock2
3 files changed, 9 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 4fda53992f..5860b04f55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,8 @@ group(:omnibus_package) do
gem "rb-readline"
gem "inspec-core", ">= 4.0.0.a", "< 5"
gem "chef-vault"
+ gem 'ed25519' # ed25519 ssh key support done here as its a native gem we can't put in train
+ gem 'bcrypt_pbkdf' # ed25519 ssh key support done here as its a native gem we can't put in train
end
group(:omnibus_package, :pry) do
diff --git a/Gemfile.lock b/Gemfile.lock
index aabc43a9f2..cde35f690d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashdiff (0.3.8)
+ hashdiff (0.3.9)
hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
@@ -195,7 +195,7 @@ GEM
jaro_winkler (1.5.2)
json (2.2.0)
libyajl2 (1.2.0)
- license-acceptance (0.2.10)
+ license-acceptance (0.2.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -211,7 +211,7 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.0.3)
- mixlib-config (2.2.18)
+ mixlib-config (3.0.1)
tomlrb
mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
@@ -320,9 +320,7 @@ GEM
timers (4.3.0)
tins (1.20.2)
tomlrb (1.2.8)
- train-core (2.0.8)
- bcrypt_pbkdf (~> 1.0)
- ed25519 (~> 1.2)
+ train-core (2.0.12)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
@@ -408,11 +406,13 @@ PLATFORMS
DEPENDENCIES
appbundler
+ bcrypt_pbkdf
chef!
chef-config!
chef-vault
cheffish (~> 14)
chefstyle!
+ ed25519
inspec-core (>= 4.0.0.a, < 5)
netrc
octokit
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index aa883ab1f3..db2232b90c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.0.3)
- mixlib-config (2.2.18)
+ mixlib-config (3.0.1)
tomlrb
mixlib-install (3.11.12)
mixlib-shellout