orchestration 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219067059e72b472f7697df1659e31d7d25b3f531a487ef0270949c95e427238
-  data.tar.gz: '079a57d5c7a6a3b59eefbd2e4b6be1b1630686d4c447b97a137c8a967f2c51a6'
+  metadata.gz: cb25cce428ce1b475d757e95164210197a9d737d64b72fc94f2565e2ab8b54a9
+  data.tar.gz: 365c9b2705a167cff5ab10a74a3b6a84ef232c9ecbb16c7371519bb76458d973
 SHA512:
-  metadata.gz: e277c0fac7a4f73254c8d011eb3a47b40bd92385b3348a21a345ab8188f246ebacd6f031edfb53fc18ba1d815c45540fd9b4c31fbaf44aa555c52fb6852f4159
-  data.tar.gz: 2ecf615a685df475723c4aef1bb86d60d7e400891a79af22941b2d5dd08f356db461492aa1fd092528e907ca4cc51ff8cb1a55c2d226dc51b99168a8f30fba50
+  metadata.gz: 9dd32821fc004fee139bd0de47cae89a5703dd3300f90601ea3c7e7e900cf1c15f1a5ac29d89bc56a21237df3a4e8d04810ec03f9df34c1e3057a3a004f378f5
+  data.tar.gz: 56cd182bc0edfdae3a494e6a876f99e42e2d1183e0d24bbd00e853d64b4a9942144913fd024c8fb4ad4b687c8602732916edc0b7d656a21d9e6ff36064bacca7

data/README.md

@@ -27,7 +27,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.6.0'
+gem 'orchestration', '~> 0.6.1'
 ```
 
 Install:

data/lib/orchestration/docker_compose/app_service.rb

@@ -99,6 +99,7 @@ module Orchestration
           'RAILS_SERVE_STATIC_FILES' => '1',
           'WEB_PRELOAD_APP' => '1',
           'WEB_HEALTHCHECK_PATH' => '/',
+          'WEB_PORT' => 8080,
           'DATABASE_URL' => database_url
         }.merge(inherited_environment.map { |key| [key, nil] }.to_h).merge(rabbitmq_urls)
       end

data/lib/orchestration/install_generator.rb

@@ -30,7 +30,6 @@ module Orchestration
     def application_makefile
       path = @env.root.join('Makefile')
       simple_copy('application.mk', path) unless File.exist?(path)
-      inject_if_missing(path, 'include orchestration/Makefile')
     end
 
     def dockerfile

data/lib/orchestration/make/orchestration.mk

@@ -297,8 +297,8 @@ ifneq (,$(wildcard config/database.yml))
 	@$(call system,rake db:create DATABASE_URL="${url}")
 	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
   ifneq (,$(wildcard db/structure.sql))
-	@$(call system,rake db:structure:load DATABASE_URL="${url}")
-	@${rake} db:structure:load DATABASE_URL='${url}' ${log} || ${exit_fail}
+	@$(call system,rake db:schema:load DATABASE_URL="${url}")
+	@${rake} db:schema:load DATABASE_URL='${url}' ${log} || ${exit_fail}
   else ifneq (,$(wildcard db/schema.rb))
 	@$(call system,rake db:schema:load DATABASE_URL="${url}")
 	@${rake} db:schema:load DATABASE_URL='${url}' ${log} || ${exit_fail}

data/lib/orchestration/templates/Dockerfile.erb

@@ -19,7 +19,9 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
  && npm install -g yarn<% end %>
 WORKDIR /app
 COPY .build/Gemfile .build/Gemfile.lock ./
-RUN bundle install --without development test --deployment
+RUN bundle config set deployment 'true' \
+ && bundle config set without 'development test' \
+ && bundle install
 ADD .build/context.tar .
 <% if defined?(Webpacker) %>RUN . /root/.bashrc ; NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT

data/lib/orchestration/templates/application.mk.erb

@@ -24,7 +24,7 @@ test:
 #
 .PHONY: post-setup
 post-setup:
-	# Setup tasks that are not already provided by Orchestration go here.
+	@# Setup tasks that are not already provided by Orchestration go here.
 
 #
 # Launch all dependencies needed for a development environment and set up the

data/lib/orchestration/templates/puma.rb.erb

@@ -1,6 +1,6 @@
 environment ENV.fetch('RAILS_ENV') { 'development' }
 
-port ENV.fetch('WEB_PORT') { 8080 }
+port ENV.fetch('WEB_PORT') { 3000 }
 workers ENV.fetch('WEB_CONCURRENCY') { 4 }
 threads_count = ENV.fetch('RAILS_MAX_THREADS') { 8 }
 

data/lib/orchestration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchestration
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/tasks/orchestration.rake

@@ -22,7 +22,13 @@ namespace :orchestration do
   namespace :db do
     desc I18n.t('orchestration.rake.db.url')
     task :url do
-      puts DatabaseUrl.to_active_record_url(Rails.application.config_for(:database))
+      config = Rails.application.config_for(:database)
+
+      if config[:adapter] == 'sqlite3'
+        puts "sqlite3:#{config[:database]}"
+      else
+        puts DatabaseUrl.to_active_record_url(config)
+      end
     end
 
     desc I18n.t('orchestration.rake.db.console')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url