orchestration 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff1c3b4c173fb4bdd92d38381a95fcf9888211de8ca845f2826e8c49a6516ec
-  data.tar.gz: 8ddc5990c8ff9b2cec9a746645bbc6173855557500d3832353b8cad0df02e434
+  metadata.gz: fa88aaad54c45cf3a049016f35f7fbe14a93e98c1f804253c6092d32581ad4bb
+  data.tar.gz: 5eff5d0d6e44485812f320ac938ff081fa49daf8b88c59ffa65c33450420bfeb
 SHA512:
-  metadata.gz: 5b234ee03b47a92596b1d5669da20543e335f2c8b168dafeecbe09a5bfa06f744bce990b3bb1c729880449c4eeac26b536c2b21f39035f6a75ccc320254fde75
-  data.tar.gz: 747f587b8f1911a8ff5b0cbc3b3dd1e8e4a88c1bb2849016e93f1f65fc0e476bc2ffe3fd84250b9584dfe3f763a1356ade4bf98c26a72042131fbb70abee8118
+  metadata.gz: e9f031ebae8eeed8122e6b3a37db600848fa2e02726162aac785b20844e1f7911a56d3d9a5cf949e585a0c4cb74b434afc3727721beabee29d707a6d25563113
+  data.tar.gz: 456825bd84a2f32ede7b4e9dc0d5720b4c15abebb35dbf244620e1f3f3f05a251ba0e7718da5c6384d1062a1553dfc61c6494f6caff9e6c42ee0fd4864922ab2

data/README.md

@@ -11,7 +11,7 @@ _Orchestration_ is a toolkit for testing, building, and deploying _Ruby_ (includ
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.3.11'
+gem 'orchestration', '~> 0.3.12'
 ```
 
 Install:

data/lib/orchestration/services/database/configuration.rb

@@ -24,7 +24,7 @@ module Orchestration
         def friendly_config
           return "[#{@adapter.name}]" if @adapter.name == 'sqlite3'
 
-          "[#{@adapter.name}] #{host}:#{local_port}"
+          "[#{@adapter.name}] #{@settings['host']}:#{@settings['port']}"
         end
 
         private
@@ -34,15 +34,15 @@ module Orchestration
           @settings = merged_settings
           return if @adapter.name == 'sqlite3'
           return unless %w[test development].include?(@env.environment)
-          return if @settings.key?('port')
+          return if environment.key?('port') || url_config['port']
 
           @settings.merge!('port' => local_port) if @env.docker_compose_config?
         end
 
         def merged_settings
+          port = base['port'] || DockerCompose::DatabaseService::PORT
           base.merge(@adapter.credentials)
-              .merge('scheme' => base['adapter'],
-                     'port' => DockerCompose::DatabaseService::PORT)
+              .merge('scheme' => base['adapter'], 'port' => port)
         end
 
         def parse(content)

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

@@ -43,7 +43,7 @@ start:
 	@echo "Starting containers..."
 ifeq (${env},$(filter ${env},test development))
 	@${compose} up -d
-	@docker network connect $${hostname} || :
+	@docker network connect ${docker_repository}_${env}_default $${hostname} 2>/dev/null || :
 else
 	@${compose} up -d --scale app=$${instances:-1}
 endif

data/lib/orchestration/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Bob Farrell