orchestration 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de40b0bbbef8c548aa941a18486aa43c7ba6fe8433c9a14acd8cde13fc9e62b
-  data.tar.gz: b7b5cc3303a38971aabdd77217be5cb58ffa9519841724234ed8062854850de7
+  metadata.gz: 3658b497eae57e7f247ef8f703ddb90ca6c041a2aba5409c61e54291a8e80c22
+  data.tar.gz: 4a7a242492fd376b62ccb30c2dbf6e5e9163aa202e5fefbbb75b1fef4eab315c
 SHA512:
-  metadata.gz: fb4c23106ebec66f5eff4d2400a33e7370adffbd201800b4c4a9bda3eea0c5292b97d7011d0e5cf309f23f2ed6a5b4d599010062ee08327dc50d5b99e5a25c1d
-  data.tar.gz: 2fa9e0131222a6b368c321d9dcd314503c96e57ef639551847a17a04c4a624fa5606347ed4fdc80e3fc4535303f4fd93b65d1b241a45879423e137e9865848ad
+  metadata.gz: d855b7c336167af5db5444f96319de4236d7bb19fdb2ad0554b0c1730485ff57f3d1e3e9d8317138fe60797ac4cf4011bf76f168c1e8948ce3e242e0a012d7c6
+  data.tar.gz: 98c840d9cdd7272fa2f167373b5df176f9bb0a6d6b22f4be897dd64290f51c17087a20c8f5765e1fdd68890beae7f9de74fdde839441d014d873dfb1effd1996

data/README.md

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

data/lib/orchestration/environment.rb

@@ -18,7 +18,14 @@ module Orchestration
     end
 
     def database_url
-      ENV['DATABASE_URL']
+      case environment
+      when 'development'
+        ENV['DEVELOPMENT_DATABASE_URL'] || ENV['DATABASE_URL']
+      when 'test'
+        ENV['TEST_DATABASE_URL'] || ENV['DATABASE_URL']
+      else
+        ENV['DATABASE_URL']
+      end
     end
 
     def mongo_url

data/lib/orchestration/templates/Dockerfile.erb

@@ -1,6 +1,7 @@
 FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
+ARG GIT_COMMIT
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -23,6 +24,7 @@ RUN . /root/.bashrc && yarn install
 <% end %>
 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
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \
             --start-period=<%= healthcheck['start_period'] %> \

data/lib/orchestration/templates/database.yml.erb

@@ -21,8 +21,8 @@ test:
   database: <%= compose.call(nil).database_adapter.credentials['database'] %>
   # Useful for certain continuous integration environments (e.g. Jenkins in
   # Docker) where the DB hostname may be a service name rather than `127.0.0.1`:
-  <%% if ENV.key?('DATABASE_URL') %>
-  url: <%%= ENV['DATABASE_URL'] %>
+  <%% if ENV.key?('TEST_DATABASE_URL') %>
+  url: <%%= ENV['TEST_DATABASE_URL'] %>
   <%% end %>
 <% end %>
 

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

@@ -288,6 +288,7 @@ build:
 	@docker build \
                         --build-arg BUNDLE_GITHUB__COM \
                         --build-arg BUNDLE_BITBUCKET__ORG \
+                        --build-arg GIT_COMMIT='${git_version}' \
                         -t ${docker_organization}/${docker_repository} \
                         -t ${docker_organization}/${docker_repository}:${git_version} \
                         ${orchestration_dir}/ ${log_progress} || ${fail}

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url