summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-05-21 16:30:57 -0700
committerGitHub <noreply@github.com>2021-05-21 16:30:57 -0700
commita064c81d5138d089a2adcbc235a73539d65b6bed (patch)
tree81f5fb269dac6723eef5a0a444dc0a6548db05e9 /omnibus
parentcaf0a49fad4efb89c84d0982ac4fe602e33308ed (diff)
parentaa45f20f415dd28bf9da19e48f58615f38502684 (diff)
downloadchef-a064c81d5138d089a2adcbc235a73539d65b6bed.tar.gz
Merge pull request #11461 from chef/jgarud/update-gemfile-to-support-env-vars-chef-16
updating Gemfile to support environment variables
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock70
2 files changed, 35 insertions, 39 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 232d6b6551..052ac6bfd9 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "master")
+gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "master")
gem "artifactory"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bf02784821..0b9181141a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,17 @@
GIT
- remote: https://github.com/chef/omnibus
- revision: dd5789621fa32da5846b9cb92ea902015265734c
+ remote: https://github.com/chef/omnibus-software.git
+ revision: 3ac1dbed61173f0919b9f8215bc1af00d7a6c27b
+ branch: master
+ specs:
+ omnibus-software (4.0.0)
+ omnibus (>= 8.0.0)
+
+GIT
+ remote: https://github.com/chef/omnibus.git
+ revision: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09
branch: master
specs:
- omnibus (8.1.3)
+ omnibus (8.1.8)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -11,19 +19,11 @@ GIT
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
mixlib-versioning
- ohai (>= 15)
+ ohai (>= 15, < 17)
pedump
ruby-progressbar (~> 1.7)
thor (>= 0.18, < 2.0)
-GIT
- remote: https://github.com/chef/omnibus-software
- revision: 3ac1dbed61173f0919b9f8215bc1af00d7a6c27b
- branch: master
- specs:
- omnibus-software (4.0.0)
- omnibus (>= 8.0.0)
-
GEM
remote: https://rubygems.org/
specs:
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.1.1)
- aws-partitions (1.446.0)
+ aws-partitions (1.449.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -41,15 +41,13 @@ GEM
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.93.1)
+ aws-sdk-s3 (1.94.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.3)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt_pbkdf (1.1.0)
- bcrypt_pbkdf (1.1.0-x64-mingw32)
- bcrypt_pbkdf (1.1.0-x86-mingw32)
berkshelf (7.2.0)
chef (>= 15.7.32)
chef-config
@@ -64,12 +62,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.12.3)
+ chef (16.13.16)
addressable
bcrypt_pbkdf (~> 1.1)
bundler (>= 1.10)
- chef-config (= 16.12.3)
- chef-utils (= 16.12.3)
+ chef-config (= 16.13.16)
+ chef-utils (= 16.13.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -102,9 +100,9 @@ GEM
tty-table (~> 0.11)
uuidtools (>= 2.1.5, < 3.0)
chef-cleanroom (1.0.2)
- chef-config (16.12.3)
+ chef-config (16.13.16)
addressable
- chef-utils (= 16.12.3)
+ chef-utils (= 16.13.16)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -112,7 +110,7 @@ GEM
chef-telemetry (1.0.29)
chef-config
concurrent-ruby (~> 1.0)
- chef-utils (16.12.3)
+ chef-utils (16.13.16)
chef-vault (4.1.0)
chef-zero (15.0.4)
ffi-yajl (~> 2.2)
@@ -129,16 +127,18 @@ GEM
ed25519 (1.2.4)
erubi (1.10.0)
erubis (2.7.0)
- faraday (1.3.0)
+ faraday (1.4.1)
+ faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
+ faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
- ruby2_keywords
+ ruby2_keywords (>= 0.0.4)
+ faraday-excon (1.1.0)
faraday-net_http (1.0.1)
+ faraday-net_http_persistent (1.1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.0)
- ffi (1.15.0-x64-mingw32)
- ffi (1.15.0-x86-mingw32)
ffi-libarchive (1.0.17)
ffi (~> 1.0)
ffi-yajl (2.4.0)
@@ -152,10 +152,10 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.29.3)
+ inspec-core (4.36.4)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
- faraday (>= 0.9.0, < 1.4)
+ faraday (>= 0.9.0, < 1.5)
faraday_middleware (~> 1.0)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
@@ -199,8 +199,6 @@ GEM
minitar (0.9)
mixlib-archive (1.1.7)
mixlib-log
- mixlib-archive (1.1.7-universal-mingw32)
- mixlib-log
mixlib-authentication (3.0.10)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -227,10 +225,10 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
- octokit (4.20.0)
+ octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (16.12.3)
+ ohai (16.13.0)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -255,7 +253,7 @@ GEM
zhexdump (>= 0.0.2)
plist (3.6.0)
proxifier (1.0.3)
- pry (0.14.0)
+ pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
@@ -314,7 +312,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.6.2)
+ train-core (3.7.0)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -331,7 +329,7 @@ GEM
tty-cursor (~> 0.7)
tty-color (0.6.0)
tty-cursor (0.7.1)
- tty-prompt (0.23.0)
+ tty-prompt (0.23.1)
pastel (~> 0.8)
tty-reader (~> 0.8)
tty-reader (0.9.0)
@@ -371,8 +369,6 @@ GEM
PLATFORMS
ruby
- x64-mingw32
- x86-mingw32
DEPENDENCIES
artifactory