Skip to content

Commit a3ccc49

Browse files
committed
LPD-55579 offload filtering to Docker
1 parent 8a4412d commit a3ccc49

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

buildSrc/src/main/groovy/docker-liferay-bundle.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import com.liferay.docker.workspace.environments.Util
22

33
import de.undercouch.gradle.tasks.download.Download
44

5-
import groovy.json.JsonSlurper
6-
75
import groovy.xml.XmlSlurper
86
import groovy.xml.slurpersupport.GPathResult
97

@@ -292,11 +290,7 @@ tasks.register("listAdminUsers") {
292290
Closure<Void> listAdminUsersForCompany = {
293291
String companyId, String hostname, String webId, String schema ->
294292

295-
JsonSlurper jsonSlurper = new JsonSlurper()
296-
297-
String networkPorts = waitForCommand("docker inspect ${config.namespace}-liferay --format '{{ json .NetworkSettings.Ports }}'")
298-
299-
String tcp8080Port = jsonSlurper.parseText(networkPorts)["8080/tcp"][0]["HostPort"]
293+
String tcp8080Port = waitForCommand("docker compose ps liferay --format '{{range .Publishers}}{{if and (eq .URL \"0.0.0.0\") (eq .TargetPort 8080)}}{{.PublishedPort}}{{end}}{{end}}'")
300294

301295
List results = executeSQLQuery("select screenName, emailAddress from User_ where companyId = ${companyId} and userId in (select userId from Users_Roles where roleId in (select roleId from Role_ where name = 'Administrator'))", schema)
302296

0 commit comments

Comments
 (0)