Skip to content

Commit

Permalink
Update gems. Don't generate docs when building image.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hermanzdosilovic
hermanzdosilovic committed Jan 12, 2020
1 parent 230c7a7 commit 69a9fe1
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 61 deletions.
1 change: 0 additions & 1 deletion .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ judge0-api.conf*
log/*
scripts
!scripts/load-config
!scripts/prod-gen-api-docs
!scripts/run-server
!scripts/run-workers
srv
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apt-get update && \
sudo && \
rm -rf /var/lib/apt/lists/* && \
echo "gem: --no-document" > /root/.gemrc && \
gem install bundler:2.0.2 && \
gem install bundler:2.1.4 && \
npm install -g --unsafe-perm [email protected]

EXPOSE 3000
Expand All @@ -29,7 +29,6 @@ COPY Gemfile* ./
RUN RAILS_ENV=production bundle

COPY . .
RUN ./scripts/prod-gen-api-docs

CMD ["./scripts/run-server"]

Expand Down
18 changes: 9 additions & 9 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
source 'https://rubygems.org'

gem 'rails', '~> 5.0.0'
gem 'pg', '~> 0.18'
gem 'pg', '~> 1.2.2'

gem 'active_model_serializers', '~> 0.10.2'
gem 'enumerations', '~> 2.1'
gem 'pry-byebug', '~> 3.4'
gem 'active_model_serializers', '~> 0.10.10'
gem 'enumerations', '~> 2.3.3'
gem 'pry-byebug', '~> 3.7.0'
gem 'pry-rails', '~> 0.3.9'
gem 'puma', '~> 3.12'
gem 'rack-cors', require: 'rack/cors'
gem 'puma', '~> 4.3.1'
gem 'rack-cors', '~> 1.1.1'
gem 'resque', '~> 2.0.0'
gem 'will_paginate', '~> 3.1'
gem 'will_paginate', '~> 3.2.1'

group :development do
gem 'annotate', '~> 2.7'
gem 'listen', '~> 3.1'
gem 'annotate', '~> 3.0.3'
gem 'listen', '~> 3.2.1'
end
99 changes: 50 additions & 49 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.10.9)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
active_model_serializers (0.10.10)
actionpack (>= 4.1, < 6.1)
activemodel (>= 4.1, < 6.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.0.7.2)
Expand All @@ -43,48 +43,48 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
annotate (2.7.5)
annotate (3.0.3)
activerecord (>= 3.2, < 7.0)
rake (>= 10.4, < 13.0)
rake (>= 10.4, < 14.0)
arel (7.1.4)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
case_transform (0.2)
activesupport
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.5)
enumerations (2.3.2)
enumerations (2.3.3)
activerecord
activesupport
i18n
erubis (2.7.0)
ffi (1.11.1)
ffi (1.11.3)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
i18n (1.8.1)
concurrent-ruby (~> 1.0)
jsonapi-renderer (0.2.2)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.1)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.13.0)
mono_logger (1.1.0)
multi_json (1.13.1)
mustermann (1.0.3)
nio4r (2.3.1)
nokogiri (1.10.5)
multi_json (1.14.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nio4r (2.5.2)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
pg (0.21.0)
pg (1.2.2)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
Expand All @@ -93,11 +93,12 @@ GEM
pry (~> 0.10)
pry-rails (0.3.9)
pry (>= 0.10.4)
puma (3.12.2)
rack (2.0.8)
rack-cors (1.1.0)
puma (4.3.1)
nio4r (~> 2.0)
rack (2.1.1)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-protection (2.0.5)
rack-protection (2.0.8.1)
rack
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -116,68 +117,68 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
rake (13.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.1.2)
redis-namespace (1.6.0)
redis (4.1.3)
redis-namespace (1.7.0)
redis (>= 3.0.4)
resque (2.0.0)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.6)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
ruby_dep (1.5.0)
sinatra (2.0.5)
ruby2_keywords (0.0.2)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.5)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.9)
tzinfo (1.2.5)
tilt (2.0.10)
tzinfo (1.2.6)
thread_safe (~> 0.1)
vegas (0.1.11)
rack (>= 1.0.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.7)
will_paginate (3.2.1)

PLATFORMS
ruby

DEPENDENCIES
active_model_serializers (~> 0.10.2)
annotate (~> 2.7)
enumerations (~> 2.1)
listen (~> 3.1)
pg (~> 0.18)
pry-byebug (~> 3.4)
active_model_serializers (~> 0.10.10)
annotate (~> 3.0.3)
enumerations (~> 2.3.3)
listen (~> 3.2.1)
pg (~> 1.2.2)
pry-byebug (~> 3.7.0)
pry-rails (~> 0.3.9)
puma (~> 3.12)
rack-cors
puma (~> 4.3.1)
rack-cors (~> 1.1.1)
rails (~> 5.0.0)
resque (~> 2.0.0)
will_paginate (~> 3.1)
will_paginate (~> 3.2.1)

BUNDLED WITH
2.0.2
2.1.4

0 comments on commit 69a9fe1

Please sign in to comment.