orchestration 0.3.11 → 0.3.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fa88aaad54c45cf3a049016f35f7fbe14a93e98c1f804253c6092d32581ad4bb
|
|
4
|
+
data.tar.gz: 5eff5d0d6e44485812f320ac938ff081fa49daf8b88c59ffa65c33450420bfeb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e9f031ebae8eeed8122e6b3a37db600848fa2e02726162aac785b20844e1f7911a56d3d9a5cf949e585a0c4cb74b434afc3727721beabee29d707a6d25563113
|
|
7
|
+
data.tar.gz: 456825bd84a2f32ede7b4e9dc0d5720b4c15abebb35dbf244620e1f3f3f05a251ba0e7718da5c6384d1062a1553dfc61c6494f6caff9e6c42ee0fd4864922ab2
|
data/README.md
CHANGED
|
@@ -24,7 +24,7 @@ module Orchestration
|
|
|
24
24
|
def friendly_config
|
|
25
25
|
return "[#{@adapter.name}]" if @adapter.name == 'sqlite3'
|
|
26
26
|
|
|
27
|
-
"[#{@adapter.name}] #{host}:#{
|
|
27
|
+
"[#{@adapter.name}] #{@settings['host']}:#{@settings['port']}"
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
private
|
|
@@ -34,15 +34,15 @@ module Orchestration
|
|
|
34
34
|
@settings = merged_settings
|
|
35
35
|
return if @adapter.name == 'sqlite3'
|
|
36
36
|
return unless %w[test development].include?(@env.environment)
|
|
37
|
-
return if
|
|
37
|
+
return if environment.key?('port') || url_config['port']
|
|
38
38
|
|
|
39
39
|
@settings.merge!('port' => local_port) if @env.docker_compose_config?
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
def merged_settings
|
|
43
|
+
port = base['port'] || DockerCompose::DatabaseService::PORT
|
|
43
44
|
base.merge(@adapter.credentials)
|
|
44
|
-
.merge('scheme' => base['adapter'],
|
|
45
|
-
'port' => DockerCompose::DatabaseService::PORT)
|
|
45
|
+
.merge('scheme' => base['adapter'], 'port' => port)
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
def parse(content)
|
|
@@ -43,7 +43,7 @@ start:
|
|
|
43
43
|
@echo "Starting containers..."
|
|
44
44
|
ifeq (${env},$(filter ${env},test development))
|
|
45
45
|
@${compose} up -d
|
|
46
|
-
@docker network connect $${hostname} || :
|
|
46
|
+
@docker network connect ${docker_repository}_${env}_default $${hostname} 2>/dev/null || :
|
|
47
47
|
else
|
|
48
48
|
@${compose} up -d --scale app=$${instances:-1}
|
|
49
49
|
endif
|