-
Notifications
You must be signed in to change notification settings - Fork 165
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
Enterprise to master. #1316
base: master
Are you sure you want to change the base?
Enterprise to master. #1316
Changes from 34 commits
11175e2
c73e9ee
4a759ca
5ee50d2
ba2c4dc
26be255
a89750c
82d5198
52adedb
b968fac
40153e7
95b0da0
2bce53f
41af887
6e817cc
d8b682f
eaefc8a
c12eb15
8d8d693
978635f
e036f1b
0bd5566
ef4b8f8
a6be270
cd697da
415f12c
fe48847
edfd3a7
22f7893
fedd96c
9deeb71
09ac6dd
ab08a8c
c567088
b3b45c1
83d6944
27fec3b
063ffb3
e830a80
ad89c7b
74fb28d
e4d67d7
ec37998
68eef36
43ef552
45efe5c
f435814
b192120
5721958
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,13 +2,17 @@ FROM ruby:3.2.2-slim | |
|
||
LABEL maintainer Travis CI GmbH <[email protected]> | ||
|
||
# packages required for bundle install | ||
RUN ( \ | ||
mkdir -p /app/vendor /app/cache; \ | ||
groupadd -r travis -g 1000 && \ | ||
useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\ | ||
chown -R travis:travis /app; \ | ||
apt-get update ; \ | ||
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev libcurl4\ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
) | ||
|
||
USER travis | ||
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 | ||
|
||
# throw errors if Gemfile has been modified since Gemfile.lock | ||
|
@@ -28,4 +32,4 @@ RUN gem install --user-install executable-hooks | |
|
||
COPY . /app | ||
|
||
CMD ./script/server-buildpacks | ||
CMD ["./script/server-buildpacks"] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
FROM ruby:3.2.2-slim | ||
|
||
LABEL maintainer Travis CI GmbH <[email protected]> | ||
|
||
RUN ( \ | ||
mkdir -p /app/vendor /app/cache; \ | ||
groupadd -r travis -g 1000 && \ | ||
useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\ | ||
chown -R travis:travis /app; \ | ||
apt-get update ; \ | ||
apt-get upgrade -y ; \ | ||
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev xz-utils \ | ||
&& rm -rf /var/lib/apt/lists/*; \ | ||
gem update --system; \ | ||
bundle config set app_config /app; \ | ||
bundle config set cache_path /app; \ | ||
bundle config --global frozen 1; \ | ||
bundle config set deployment 'true'; \ | ||
chown -R travis:travis /usr/local/bundle; \ | ||
) | ||
|
||
|
||
|
||
WORKDIR /app | ||
|
||
USER travis | ||
COPY Gemfile* /app/ | ||
RUN ( \ | ||
bundle config set without 'development test'; \ | ||
bundler install --verbose --retry=3; \ | ||
bundle config set frozen true; \ | ||
) | ||
USER root | ||
RUN ( apt-get remove -y gcc g++ make git perl xz-utils && apt-get -y autoremove; \ | ||
bundle clean && rm -rf /app/vendor/bundle/ruby/2.7.0/cache/*; \ | ||
for i in `find /app/vendor/ -name \*.o -o -name \*.c -o -name \*.h`; do rm -f $i; done; \ | ||
) | ||
|
||
USER travis | ||
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 | ||
|
||
COPY . /app | ||
|
||
CMD ["./script/server-buildpacks"] |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,56 +5,54 @@ ruby '3.2.2' | |
gem 'mime-types' | ||
|
||
# travis maintained gems | ||
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support' | ||
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support', ref: '4dda53ffa96b804db22c261551256caa18c4a2cc' | ||
gem 'travis-amqp', git: 'https://github.com/travis-ci/travis-amqp' | ||
gem 'travis-config', git: 'https://github.com/travis-ci/travis-config' | ||
gem 'travis-settings', git: 'https://github.com/travis-ci/travis-settings' | ||
gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock' | ||
gem 'travis-github_apps', git: 'https://github.com/travis-ci/travis-github_apps' | ||
gem 'travis-settings', git: 'https://github.com/travis-ci/travis-settings', branch: 'master' | ||
gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock/', branch: '6.1' | ||
gem 'travis-github_apps', git: 'https://github.com/travis-ci/travis-github_apps', branch: 'ga-ext_access' | ||
gem 'travis-rollout', git: 'https://github.com/travis-ci/travis-rollout' | ||
gem 'simple_states', git: 'https://github.com/travis-ci/simple_states', branch: 'prd-ruby-upgrade-dev' | ||
gem 'metriks', git: 'https://github.com/travis-ci/metriks' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added |
||
gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics' | ||
gem 'marginalia', git: 'https://github.com/travis-ci/marginalia' | ||
gem 'gh', git: 'https://github.com/travis-ci/gh' | ||
gem 'rollout', git: 'https://github.com/travis-ci/rollout' | ||
|
||
gem 'mustermann' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added |
||
gem 'sinatra' | ||
gem 'sinatra', '~> 2' | ||
gem 'sinatra-contrib', require: nil #git: 'https://github.com/sinatra/sinatra-contrib', require: nil | ||
|
||
gem 'active_model_serializers' , '~> 0.9.9' | ||
gem 'unicorn' | ||
gem 'sentry-ruby' | ||
gem 'yard-sinatra', git: 'https://github.com/rkh/yard-sinatra' | ||
gem 'rack', '~> 2.2' | ||
gem 'rack-contrib' | ||
gem 'rack-contrib', '= 2.3.0' | ||
gem 'rack-cache', git: 'https://github.com/rtomayko/rack-cache' | ||
gem 'rack-attack', '~> 6' | ||
gem 'bunny', '~> 2.22' | ||
gem 'dalli' | ||
gem 'pry' | ||
gem 'http', '~> 4' | ||
gem 'metriks', '0.9.9.6' | ||
gem 'metriks-librato_metrics', git: 'https://github.com/eric/metriks-librato_metrics' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. keep the ones from master(metriks/metriks-librato_metrics There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
gem 'librato-metrics' | ||
gem 'simplecov' | ||
gem 'stackprof' | ||
gem "ipaddress", "~> 0.8.3" | ||
gem 'nakayoshi_fork' | ||
gem 'sidekiq' | ||
gem 'sidekiq', '~> 6.4.0' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't pin the version to 6, current is 7.x |
||
gem 'redis-namespace' | ||
|
||
gem 'rbtrace' | ||
gem 'memory_profiler' | ||
gem 'allocation_tracer' | ||
|
||
gem 'redlock' | ||
gem 'rake', '~> 13.0' | ||
gem 'rake', '~> 13.0.6' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not needed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
|
||
gem 'libhoney' | ||
gem 'opencensus' | ||
gem 'opencensus-stackdriver' | ||
|
||
gem 'faraday', '~> 2' | ||
gem 'faraday-net_http_persistent', '~> 2' | ||
gem 'faraday' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. needs 2, now it dropped to 1.10 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
gem 'faraday-net_http_persistent' | ||
|
||
gem 'knapsack' | ||
|
||
|
@@ -67,15 +65,22 @@ gem 'tool' | |
gem 'google-cloud-storage' | ||
gem 'aws-sdk-s3' | ||
gem 'activerecord', '~> 7.0.8' # it was fixed in predicate_builder file to 7.0.6 but gh gem requires 7.0.8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and gh gem needs update , not this one, should be 7.0.6 - otherwise api won't work There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
gem 'google-protobuf', '~> 3.19.6' | ||
gem 'fog-aws', '~> 0.12.0' | ||
gem 'fog-google' | ||
gem 'coder', '~> 0.4.0' | ||
gem 'dry-types' | ||
gem 'dry-struct' | ||
gem 'dry-schema' | ||
gem 'redis', '~> 5.0' | ||
gem 'virtus', '~> 1.0.0' | ||
gem 'hashr' | ||
gem 'pusher', '~> 2.0.3' | ||
gem 'multi_json' | ||
gem 'closeio', '~> 3.15' | ||
gem 'closeio' | ||
gem 'addressable', '~> 2.8.0' | ||
gem 'rack', '~> 2.2.3' | ||
gem 'os', '~> 1.1.4' | ||
|
||
group :test do | ||
gem 'rspec' | ||
|
@@ -88,6 +93,7 @@ group :test do | |
gem 'hashdiff' | ||
gem 'pry-byebug' | ||
gem 'rack-test' | ||
gem 'simplecov' | ||
end | ||
|
||
group :development do | ||
|
@@ -100,6 +106,5 @@ group :development, :test do | |
gem 'rubocop', require: false | ||
gem 'rubocop-performance', require: false | ||
gem 'rubocop-rspec', require: false | ||
gem 'simplecov', require: false | ||
gem 'simplecov-console', require: false | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
master, latest updates are already merged
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done