Skip to content

2.3.3 Bumped docker-client and added jsmContainer.enableJvmDebug() #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
farthinder merged 3 commits into from
Aug 25, 2023
Merged

2.3.3 Bumped docker-client and added jsmContainer.enableJvmDebug() #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
703ebf8
pom.xml
farthinder May 23, 2023
f8a7e9d
pom.xml
farthinder Aug 25, 2023
590db60
Merge branch 'master' into 2.3.x-fixes
farthinder Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.eficode</groupId>
<artifactId>devstack</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.3-SNAPSHOT</version>
<packaging>jar</packaging>

<name>DevStack</name>
Expand Down
36 changes: 27 additions & 9 deletions src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,23 @@ class JsmContainer implements Container {
String containerImageTag = "latest"
long jvmMaxRam = 6000

private String debugPort //Contains the port used for JVM debug

JsmContainer(String dockerHost = "", String dockerCertPath = "") {
if (dockerHost && dockerCertPath) {
assert setupSecureRemoteConnection(dockerHost, dockerCertPath): "Error setting up secure remote docker connection"
}
}

/**
* Enables JVM debug of JIRA for port portNr
* @param portNr
*/
void enableJvmDebug(String portNr = "5005") {

assert !created: "Error, cant enable JVM Debug for a container that has already been crated"
debugPort = portNr
}

/**
* Gets the latest version number from Atlassian Marketplace
Expand All @@ -38,9 +49,9 @@ class JsmContainer implements Container {
UnirestInstance unirest = Unirest.spawnInstance()

HttpResponse<JsonResponse> response = unirest.get("https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest").asJson() as HttpResponse<JsonResponse>
assert response.success : "Error getting latest JSM version from marketplace"
assert response.success: "Error getting latest JSM version from marketplace"
String version = response?.body?.object?.get("name")
assert version : "Error parsing latest JSM version from marketplace response"
assert version: "Error parsing latest JSM version from marketplace response"

unirest.shutDown()

Expand All @@ -50,7 +61,7 @@ class JsmContainer implements Container {
@Override
ContainerCreateRequest setupContainerCreateRequest() {

String image = containerImage + ":" + containerImageTag
String image = containerImage + ":" + containerImageTag

log.debug("Setting up container create request for JSM container")
if (dockerClient.engineArch != "x86_64") {
Expand All @@ -72,13 +83,24 @@ class JsmContainer implements Container {
ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->

c.image = image
c.hostname = containerName
c.env = ["JVM_MAXIMUM_MEMORY=" + jvmMaxRam + "m", "JVM_MINIMUM_MEMORY=" + ((jvmMaxRam / 2) as String) + "m", "ATL_TOMCAT_PORT=" + containerMainPort] + customEnvVar


c.exposedPorts = [(containerMainPort + "/tcp"): [:]]
c.hostConfig = new HostConfig().tap { h ->
h.portBindings = [(containerMainPort + "/tcp"): [new PortBinding("0.0.0.0", (containerMainPort))]]

if (debugPort) {
h.portBindings.put((debugPort + "/tcp"), [new PortBinding("0.0.0.0", (debugPort))])
c.exposedPorts.put((debugPort + "/tcp"), [:])
c.env.add("JVM_SUPPORT_RECOMMENDED_ARGS=-Xdebug -Xrunjdwp:transport=dt_socket,address=*:${debugPort},server=y,suspend=n".toString())
}


h.mounts = this.mounts
}
c.hostname = containerName
c.env = ["JVM_MAXIMUM_MEMORY=" + jvmMaxRam + "m", "JVM_MINIMUM_MEMORY=" + ((jvmMaxRam / 2) as String) + "m", "ATL_TOMCAT_PORT=" + containerMainPort] + customEnvVar



}
Expand All @@ -88,10 +110,6 @@ class JsmContainer implements Container {
}






boolean runOnFirstStartup() {

ArrayList<String> initialOut = runBashCommandInContainer("echo END")
Expand Down