From 9c923c91d18fa79f75fe26fc82e08b6b9562b568 Mon Sep 17 00:00:00 2001 From: Thiru Njuguna Date: Wed, 23 Jan 2019 23:26:36 +0300 Subject: [PATCH] Lock Dockerfile to Version 2.5.3 (#7) --- Gemfile.lock | 62 +++++++++---------- lib/natra/generators/app/templates/Dockerfile | 14 ++++- lib/natra/version.rb | 2 +- natra.gemspec | 4 +- 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b6f44e6..4154bc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,22 @@ PATH remote: . specs: - natra (0.0.7) + natra (0.0.8) activesupport (~> 5.0) thor (~> 0.18) GEM remote: https://rubygems.org/ specs: - actionpack (5.2.1) - actionview (= 5.2.1) - activesupport (= 5.2.1) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.1) - activesupport (= 5.2.1) + actionview (5.2.2) + activesupport (= 5.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -26,9 +26,9 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activemodel (5.2.1) - activesupport (= 5.2.1) - activesupport (5.2.1) + activemodel (5.2.2) + activesupport (= 5.2.2) + activesupport (5.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -38,7 +38,7 @@ GEM case_transform (0.2) activesupport coderay (1.1.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -48,10 +48,10 @@ GEM crass (1.0.4) diff-lcs (1.3) docile (1.3.1) - erubi (1.7.1) - ffi (1.9.25) + erubi (1.8.0) + ffi (1.10.0) formatador (0.2.5) - guard (2.14.2) + guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -68,9 +68,9 @@ GEM guard-rubocop (1.3.0) guard (~> 2.0) rubocop (~> 0.20) - i18n (1.1.1) + i18n (1.5.3) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.1) + jaro_winkler (1.5.2) json (2.1.0) jsonapi-renderer (0.2.0) listen (3.1.5) @@ -81,20 +81,20 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) - method_source (0.9.1) - mini_portile2 (2.3.0) + method_source (0.9.2) + mini_portile2 (2.4.0) minitest (5.11.3) nenv (0.3.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.13.0) + parser (2.6.0.0) ast (~> 2.4.0) powerpack (0.1.2) - pry (0.12.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) rack (2.0.6) @@ -106,10 +106,10 @@ GEM rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -123,7 +123,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.60.0) + rubocop (0.63.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -139,21 +139,21 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - term-ansicolor (1.7.0) + term-ansicolor (1.7.1) tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) - tins (1.18.0) + tins (1.20.2) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.0) + unicode-display_width (1.4.1) PLATFORMS ruby DEPENDENCIES active_model_serializers (~> 0.10.0.rc1) - bundler (~> 1.16) + bundler (~> 2.0) coveralls guard guard-rspec @@ -164,4 +164,4 @@ DEPENDENCIES rspec BUNDLED WITH - 1.17.1 + 2.0.1 diff --git a/lib/natra/generators/app/templates/Dockerfile b/lib/natra/generators/app/templates/Dockerfile index 73b4525..bb01e58 100644 --- a/lib/natra/generators/app/templates/Dockerfile +++ b/lib/natra/generators/app/templates/Dockerfile @@ -1,13 +1,25 @@ -FROM ruby AS base +FROM ruby:2.5.3 AS base + WORKDIR /usr/src/app + RUN gem install bundler + COPY Gemfile /usr/src/app/ + FROM base AS development + RUN bundle install -j5 --without staging production + COPY . /usr/src/app + FROM base AS release + RUN bundle install -j5 --without development test + RUN chmod 755 ./usr/src/app + RUN chmod 755 ./usr/src/app/bin/setup + COPY . /usr/src/app + CMD puma diff --git a/lib/natra/version.rb b/lib/natra/version.rb index 128b8f0..adee90a 100644 --- a/lib/natra/version.rb +++ b/lib/natra/version.rb @@ -1,3 +1,3 @@ module Natra - VERSION = '0.0.7'.freeze + VERSION = '0.0.8'.freeze end diff --git a/natra.gemspec b/natra.gemspec index 93e0860..dff254d 100644 --- a/natra.gemspec +++ b/natra.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |spec| spec.email = ['thirunjuguna@outlook.com'] spec.summary = 'Natra generate a light weight sinatra application' - spec.description = 'Natra generate a light weight sinatra application.It\'s ideal for building containerized micro-services with postgres database' + spec.description = 'Natra generate a light weight sinatra application.It\'s ideal for building containerized api services with postgres database' spec.homepage = 'https://github.com/thirunjuguna/natra' spec.license = 'MIT' if spec.respond_to?(:metadata) @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| end spec.executables = ['natra'] spec.require_paths = ['lib'] - spec.add_development_dependency 'bundler', '~> 1.16' + spec.add_development_dependency 'bundler', '~> 2.0' spec.add_runtime_dependency('activesupport', '~> 5.0') spec.add_runtime_dependency('thor', '~> 0.18') end