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

omnibus build fixes #1821

Merged
merged 13 commits into from
Sep 17, 2019
Prev Previous commit
Next Next commit
remove unicorn cookbook dep & update all the omnibus things
In an effort to reduce the number of dependencies in the
omnibus-internal cookbook, this removes the unicorn cookbook as a
dependency.  The unicorn cookbook was being used for its configuration
template only. Opted to copy the template directly into the
omnibus-internal cookbook and manage it ourselves.

Signed-off-by: Robb Kidd <rkidd@chef.io>
  • Loading branch information
robbkidd committed Aug 16, 2019
commit 13ea20cbc79a5d7ec0344b3a3f42d1e48fe876fd
199 changes: 108 additions & 91 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 4187714031ef65026ea91a38ce2b6b2087f8be7f
revision: 5fa35959f6efb0a5a745c46e4b0431a2826934da
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
omnibus (>= 5.6.1)

GIT
remote: https://github.com/chef/omnibus.git
revision: 33bddeefb10afe23a57ea72807625881ab01990f
revision: c4c0c518caf5c559ddf3d0ae773013d5dbc6bd3c
specs:
omnibus (6.1.0)
omnibus (6.1.2)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -26,13 +26,13 @@ GIT
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.195.0)
aws-sdk-core (3.61.2)
aws-partitions (1.202.0)
aws-sdk-core (3.62.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
@@ -46,75 +46,80 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
berkshelf (7.0.7)
bcrypt_pbkdf (1.0.1)
berkshelf (7.0.8)
chef (>= 13.6.52)
chef-config
cleanroom (~> 1.0)
concurrent-ruby (~> 1.0)
minitar (>= 0.6)
mixlib-archive (~> 0.4)
mixlib-archive (>= 0.4, < 2.0)
mixlib-config (>= 2.2.5)
mixlib-shellout (~> 2.0)
mixlib-shellout (>= 2.0, < 4.0)
octokit (~> 4.0)
retryable (~> 2.0)
retryable (>= 2.0, < 4.0)
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.3)
chef (14.8.12)
chef (15.2.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 14.8.12)
chef-zero (>= 13.0)
chef-config (= 15.2.20)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
erubis (~> 2.7)
ffi (~> 1.9, >= 1.9.25)
ffi-libarchive
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
highline (>= 1.6.9, < 2)
iniparse (~> 1.4)
mixlib-archive (~> 0.4)
license-acceptance (~> 1.0, >= 1.0.5)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
mixlib-shellout (~> 2.4)
mixlib-cli (>= 2.1.1, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 2.4, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh (>= 4.2, < 6)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (~> 14.0)
ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
serverspec (~> 2.7)
specinfra (~> 2.10)
syslog-logger (~> 1.6)
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef-config (14.8.12)
chef-config (15.2.20)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
mixlib-shellout (~> 2.0)
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.0.1)
chef-zero (14.0.11)
chef-zero (14.0.12)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 2.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
citrus (3.0.2)
cleanroom (1.0.0)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
diff-lcs (1.3)
ed25519 (1.2.4)
equatable (0.6.1)
erubis (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
ffi-libarchive (0.4.10)
ffi (~> 1.0)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
gssapi (1.2.0)
gssapi (1.3.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
@@ -125,9 +130,15 @@ GEM
iostruct (0.0.4)
ipaddress (0.8.3)
jmespath (1.4.0)
kitchen-vagrant (1.3.6)
test-kitchen (~> 1.4)
json (2.2.0)
kitchen-vagrant (1.6.0)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license-acceptance (1.0.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
license_scout (1.0.24)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
@@ -136,39 +147,39 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
minitar (0.7)
mixlib-archive (0.4.19)
minitar (0.8)
mixlib-archive (1.0.1)
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
mixlib-config (2.2.18)
mixlib-cli (2.1.1)
mixlib-config (3.0.1)
tomlrb
mixlib-install (3.11.5)
mixlib-install (3.11.18)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (2.0.9)
mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
mixlib-versioning (1.2.7)
molinillo (0.6.6)
multi_json (1.13.1)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
necromancer (0.5.0)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh (5.2.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nori (2.6.0)
octokit (4.13.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (14.8.12)
chef-config (>= 12.8, < 15)
ohai (15.2.5)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
@@ -179,6 +190,9 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
pedump (0.5.2)
awesome_print
iostruct (>= 0.0.4)
@@ -189,56 +203,34 @@ GEM
progressbar (1.10.1)
proxifier (1.0.3)
public_suffix (3.1.1)
rack (2.0.6)
retryable (2.0.4)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rack (2.0.7)
retryable (3.0.4)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
rubyzip (1.2.2)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
rubyzip (1.2.3)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
semverse (3.0.0)
serverspec (2.41.3)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.72)
sfl (2.3)
solve (4.0.2)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
specinfra (2.76.5)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
sfl
strings (0.1.5)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (1.23.5)
test-kitchen (2.2.5)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
net-scp (>= 1.1, < 3.0)
net-ssh (>= 2.9, < 6.0)
net-ssh-gateway (>= 1.2, < 3.0)
thor (~> 0.19)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
@@ -247,8 +239,32 @@ GEM
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.8)
train-core (2.1.19)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
tty-box (0.4.0)
pastel (~> 0.7.2)
strings (~> 0.1.5)
tty-cursor (~> 0.7)
tty-color (0.5.0)
tty-cursor (0.7.0)
tty-prompt (0.19.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
tty-reader (~> 0.6.0)
tty-reader (0.6.0)
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
tty-screen (0.7.0)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
winrm (2.3.1)
winrm (2.3.2)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
@@ -265,6 +281,7 @@ GEM
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
wisper (2.0.0)
wmi-lite (1.0.2)
zhexdump (0.0.2)

2 changes: 1 addition & 1 deletion omnibus/config/projects/supermarket.rb
Original file line number Diff line number Diff line change
@@ -30,9 +30,9 @@

override :postgresql, version: '9.3.18'
override :ruby, version: "2.5.3"
override :bundler, version: "1.17.3" # this must match the BUNDLED WITH in all the repo's Gemfile.locks
override :'chef-gem', version: '14.5.33'
override :'openssl-fips', version: '2.0.16'
override :inspec, version: 'v3.9.2' # TODO: remove when license_acceptance is added

# Creates required build directories
dependency "preparation"
1 change: 0 additions & 1 deletion omnibus/cookbooks/omnibus-supermarket/metadata.rb
Original file line number Diff line number Diff line change
@@ -10,4 +10,3 @@

depends 'enterprise'
depends 'runit', '>= 3.0.3'
depends 'unicorn'
1 change: 0 additions & 1 deletion omnibus/cookbooks/omnibus-supermarket/recipes/rails.rb
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@
template 'unicorn.rb' do
path "#{node['supermarket']['var_directory']}/etc/unicorn.rb"
source 'unicorn.rb.erb'
cookbook 'unicorn'
owner node['supermarket']['user']
group node['supermarket']['group']
mode '0600'
Loading