Skip to content

Commit ad89927

Browse files
committed
Ok, try this
1 parent 82cafb8 commit ad89927

File tree

2 files changed

+36
-29
lines changed

2 files changed

+36
-29
lines changed

kuby-core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818
s.add_dependency 'helm-cli', '~> 0.3'
1919
s.add_dependency 'krane', '~> 2.0'
2020
s.add_dependency 'kuby-cert-manager', '~> 0.4'
21-
s.add_dependency 'kuby-crdb', '~> 0.2'
21+
s.add_dependency 'kuby-crdb', '~> 0.4'
2222
s.add_dependency 'kube-dsl', '~> 0.7'
2323
s.add_dependency 'kubernetes-cli', '~> 0.6'
2424
s.add_dependency 'railties', '>= 5.1'

scripts/integration.sh

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,40 @@ curdle $(find vendor/kuby-core/lib -name '*.rb') > /dev/null
1414

1515
# gems
1616
printf "\ngem 'kuby-core', path: 'vendor/kuby-core'\n" >> Gemfile
17-
# printf "gem 'kuby-prebundler', '~> 0.1'\n" >> Gemfile
18-
printf "gem 'kuby-kind', github: 'getkuby/kuby-kind', ref: '3269f5958a1d698c038640f826f8330018692f90'\n" >> Gemfile
17+
printf "gem 'kuby-prebundler', '~> 0.1'\n" >> Gemfile
18+
printf "gem 'kuby-kind', '~> 0.2'\n" >> Gemfile
1919
printf "gem 'kuby-sidekiq', '~> 0.3'\n" >> Gemfile
2020
printf "gem 'sidekiq', '~> 6.5'\n" >> Gemfile
2121

22-
printf "gem 'kuby-crdb', github: 'getkuby/kuby-crdb', ref: 'd7cdf6fa7beebb002ed66ec84f130a10c8072290'\n" >> Gemfile
23-
2422
# install ruby deps
25-
bundle install --jobs 2 --retry 3
26-
27-
# bundle lock
28-
# cat <<'EOF' > .prebundle_config
29-
# Prebundler.configure do |config|
30-
# config.storage_backend = Prebundler::S3Backend.new(
31-
# client: Aws::S3::Client.new(
32-
# region: 'default',
33-
# credentials: Aws::Credentials.new(
34-
# ENV['PREBUNDLER_ACCESS_KEY_ID'],
35-
# ENV['PREBUNDLER_SECRET_ACCESS_KEY']
36-
# ),
37-
# endpoint: 'https://us-east-1.linodeobjects.com',
38-
# http_continue_timeout: 0
39-
# ),
40-
# bucket: 'prebundler2',
41-
# region: 'us-east-1'
42-
# )
43-
# end
44-
# EOF
45-
# prebundle install --jobs 2 --retry 3 --no-binstubs
23+
bundle lock
24+
25+
cat <<'EOF' > .prebundle_config
26+
Prebundler.configure do |config|
27+
config.storage_backend = Prebundler::S3Backend.new(
28+
client: Aws::S3::Client.new(
29+
region: 'default',
30+
credentials: Aws::Credentials.new(
31+
ENV['PREBUNDLER_ACCESS_KEY_ID'],
32+
ENV['PREBUNDLER_SECRET_ACCESS_KEY']
33+
),
34+
endpoint: 'https://us-east-1.linodeobjects.com',
35+
http_continue_timeout: 0
36+
),
37+
bucket: 'prebundler2',
38+
region: 'us-east-1'
39+
)
40+
end
41+
EOF
42+
43+
prebundle install --jobs 2 --retry 3 --no-binstubs
4644

4745
# javascript deps, cxx flags because node-sass is a special snowflake
4846
CXXFLAGS="--std=c++17" yarn install
4947

5048
# bootstrap app for use with kuby
5149
bundle exec bin/rails g kuby
52-
bundle install --jobs 2 --retry 3
50+
5351
cat <<EOF > kuby.rb
5452
class VendorPhase < Kuby::Docker::Layer
5553
def apply_to(dockerfile)
@@ -59,7 +57,7 @@ end
5957
6058
require 'kuby/kind'
6159
require 'kuby/sidekiq'
62-
# require 'kuby/prebundler'
60+
require 'kuby/prebundler'
6361
require 'active_support/core_ext'
6462
require 'active_support/encrypted_configuration'
6563
@@ -87,7 +85,7 @@ Kuby.define('Kubytest') do
8785
end
8886
8987
kubernetes do
90-
# add_plugin :prebundler
88+
add_plugin :prebundler
9189
9290
add_plugin :rails_app do
9391
tls_enabled true
@@ -121,6 +119,15 @@ development:
121119
production:
122120
<<: *default
123121
database: kubytest_production
122+
cable:
123+
<<: *default
124+
database: kubytest_production
125+
queue:
126+
<<: *default
127+
database: kubytest_production
128+
cache:
129+
<<: *default
130+
database: kubytest_production
124131
EOF
125132
cat <<'EOF' > config/routes.rb
126133
Rails.application.routes.draw do

0 commit comments

Comments
 (0)