x
/
k8s-docker-suite-app-murano
Code Issues Proposed changes

Fix wrong usage of join() 

Change-Id: Iebb70cea8483b6f0a577ab6b8d8015c39fba6345
Closes-Bug: #1623006
(cherry picked from commit 493ce1927f)
This commit is contained in:
Dmytro Dovbii 2016-09-14 17:40:50 +03:00 committed by Sergey Kraynev
parent 642c1a5be7
commit d00620368e
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Applications/GlassFish/package/Classes/DockerGlassFish.yaml
View File

@ -63,19 +63,19 @@ Methods:
Body:
- If: $.publish
Then:
- $adminEndpoints: join(', ', $.applicationEndpoints.
- $adminEndpoints: $.applicationEndpoints.
where($.scope = $this._scope and $.containerPort = 4848).
select(format('http://{0}:{1}', $.address, $.port)))
- $httpEndpoints: join(', ', $.applicationEndpoints.
select(format('http://{0}:{1}', $.address, $.port))
- $httpEndpoints: $.applicationEndpoints.
where($.scope = $this._scope and $.containerPort = 8080).
select(format('http://{0}:{1}', $.address, $.port)))
- $httpsEndpoints: join(', ', $.applicationEndpoints.
select(format('http://{0}:{1}', $.address, $.port))
- $httpsEndpoints: $.applicationEndpoints.
where($.scope = $this._scope and $.containerPort = 8181).
select(format('https://{0}:{1}', $.address, $.port)))
select(format('https://{0}:{1}', $.address, $.port))
- $._environment.reporter.report(
$this,
'GlassFish {0} is available at {1} (admin) and {2} + {3} (apps)'.format(
$.name, $adminEndpoints, $httpEndpoints, $httpsEndpoints))
$.name, $adminEndpoints.join(', '), $httpEndpoints.join(', '), $httpsEndpoints.join(', ')))
Else:
- $._environment.reporter.report($this, 'GlassFish {0} has deployed but is not accessible from outside'.format($.name))

11
Applications/JBoss/package/Classes/DockerJBoss.yaml
View File

@ -61,14 +61,15 @@ Methods:
Body:
- If: $.publish
Then:
- $adminEndpoints: join(', ', $.applicationEndpoints.
- $adminEndpoints: $.applicationEndpoints.
where($.scope = $this._scope and $.containerPort = 9990).
select(format('http://{0}:{1}', $.address, $.port)))
- $httpEndpoints: join(', ', $.applicationEndpoints.
select(format('http://{0}:{1}', $.address, $.port))
- $httpEndpoints: $.applicationEndpoints.
where($.scope = $this._scope and $.containerPort = 8080).
select(format('http://{0}:{1}', $.address, $.port)))
select(format('http://{0}:{1}', $.address, $.port))
- $._environment.reporter.report(
$this,
'JBoss {0} is available at {1} (admin) and {2} (apps)'.format($.name, $adminEndpoints, $httpEndpoints))
'JBoss {0} is available at {1} (admin) and {2} (apps)'.format(
$.name, $adminEndpoints.join(', '), $httpEndpoints.join(', ')))
Else:
- $._environment.reporter.report($this, 'JBoss {0} has deployed but is not accessible from outside'.format($.name))