From dad88e01036c4c92cf9426c3e53157fe31510fc6 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Wed, 20 Jul 2022 11:30:19 +0200
Subject: [PATCH 01/17] Working on BitbucketContainer. Basic deployment now
 works

---
 .idea/jarRepositories.xml                     |  16 +-
 pom.xml                                       |   6 +-
 .../container/impl/BitbucketContainer.groovy  |  68 +++++++++
 .../container/impl/JsmContainer.groovy        |  14 +-
 .../container/impl/JsmContainerTest.groovy    |   2 +-
 .../impl/bitbucketContainerTest.groovy        | 143 ++++++++++++++++++
 6 files changed, 239 insertions(+), 10 deletions(-)
 create mode 100644 src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
 create mode 100644 src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 3fc1304..128a4be 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,21 +6,31 @@
       <option name="name" value="github" />
       <option name="url" value="https://maven.pkg.github.com/eficode/JiraInstanceManagerRest" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="eficode-github-jiraManagerRest" />
+      <option name="name" value="eficode-github-jiraManagerRest" />
+      <option name="url" value="https://github.com/eficode/JiraInstanceMangerRest/raw/packages/repository/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="id" value="eficode-github-jiraManagerRest" />
+      <option name="name" value="eficode-github-jiraManagerRest" />
+      <option name="url" value="https://github.com/eficode/JiraInstanceMangerRest/raw/pre_v1_tweaks/repository/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="mavencentral" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="central" />
diff --git a/pom.xml b/pom.xml
index b76ef45..18c0dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,11 @@
     </distributionManagement>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>bitbucketinstancemanager</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
new file mode 100644
index 0000000..e7b5915
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -0,0 +1,68 @@
+package com.eficode.devstack.container.impl
+
+import com.eficode.devstack.container.Container
+import de.gesellix.docker.client.EngineResponseContent
+import de.gesellix.docker.remote.api.ContainerCreateRequest
+import de.gesellix.docker.remote.api.HostConfig
+import de.gesellix.docker.remote.api.PortBinding
+
+class BitbucketContainer implements Container{
+
+    String containerName = "Bitbucket"
+    String containerMainPort = "7990"
+    String containerImage = "atlassian/bitbucket"
+    String containerImageTag = "latest"
+    long jvmMaxRam = 2048
+
+
+    /**
+     * Setup a secure connection to a remote docker
+     * @param dockerHost  ex: https://docker.domain.com:2376
+     * @param dockerCertPath ex: src/test/resources/dockerCert
+     */
+    BitbucketContainer(String dockerHost, String dockerCertPath) {
+        assert setupSecureRemoteConnection(dockerHost, dockerCertPath) : "Error setting up secure remote docker connection"
+    }
+
+    BitbucketContainer() {}
+
+
+    /**
+     * Creates the container
+     * @return returns container ID
+     */
+    String createContainer() {
+
+        containerId = createBbContainer(this.containerName)
+        return containerId
+
+    }
+
+    String createBbContainer(String containerName = this.containerName, String imageName = containerImage, String imageTag = containerImageTag, long maxRamMB = jvmMaxRam, String mainPort = containerMainPort) {
+
+        assert dockerClient.ping().content as String == "OK", "Error Connecting to docker service"
+
+
+        ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->
+
+            c.image = imageName + ":" + imageTag
+            c.env = ["JVM_MAXIMUM_MEMORY=" + maxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((maxRamMB / 2) as String) + "m"]
+            c.exposedPorts = [(mainPort + "/tcp"): [:]]
+            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(mainPort + "/tcp"): [new PortBinding("0.0.0.0", (mainPort.toString()))]] }
+
+        }
+
+
+        EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, containerName)
+        assert response.content.warnings.isEmpty(): "Error when creating $containerName container:" + response.content.warnings.join(",")
+
+        containerId = response.content.id
+        return containerId
+
+
+    }
+
+
+
+
+}
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index ec5d103..d01a17d 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -26,6 +26,10 @@ class JsmContainer implements Container{
     }
 
 
+    /**
+     * Creates the container
+     * @return returns container ID
+     */
     String createContainer() {
 
         containerId = createJsmContainer(this.containerName)
@@ -33,7 +37,7 @@ class JsmContainer implements Container{
 
     }
 
-    String createJsmContainer(String jsmContainerName = containerName, String imageName = containerImage, String imageTag = containerImageTag, long jsmMaxRamMB = jvmMaxRam, String jsmPort = containerMainPort) {
+    String createJsmContainer(String containerName = this.containerName, String imageName = containerImage, String imageTag = containerImageTag, long jsmMaxRamMB = jvmMaxRam, String webPort = containerMainPort) {
 
         assert dockerClient.ping().content as String == "OK", "Error Connecting to docker service"
 
@@ -42,16 +46,16 @@ class JsmContainer implements Container{
 
             c.image = imageName + ":" + imageTag
             c.env = ["JVM_MAXIMUM_MEMORY=" + jsmMaxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((jsmMaxRamMB / 2) as String) + "m"]
-            c.exposedPorts = [(jsmPort + "/tcp"): [:]]
-            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(jsmPort + "/tcp"): [new PortBinding("0.0.0.0", (jsmPort.toString()))]] }
+            c.exposedPorts = [(webPort + "/tcp"): [:]]
+            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(webPort + "/tcp"): [new PortBinding("0.0.0.0", (webPort.toString()))]] }
 
         }
 
 
 
         //EngineResponseContent response = dockerClient.run(containerCreateRequest, jsmContainerName)
-        EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, jsmContainerName)
-        assert response.content.warnings.isEmpty(): "Error when creating $jsmContainerName container:" + response.content.warnings.join(",")
+        EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, containerName)
+        assert response.content.warnings.isEmpty(): "Error when creating $containerName container:" + response.content.warnings.join(",")
 
         containerId = response.content.id
         return containerId
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
index 8c8789d..8743a14 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
@@ -26,7 +26,7 @@ class JsmContainerTest extends Specification {
 
 
     @Shared
-    String dockerRemoteHost = "https://docker.domain.com:2376"
+    String dockerRemoteHost = "https://docker.domain.se:2376"
     @Shared
     String dockerCertPath = "resources/dockerCert"
 
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
new file mode 100644
index 0000000..31b8658
--- /dev/null
+++ b/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
@@ -0,0 +1,143 @@
+package com.eficode.devstack.container.impl
+
+import com.eficode.atlassian.bitbucketInstanceManager.BitbucketInstanceManagerRest
+import de.gesellix.docker.client.DockerClientImpl
+import de.gesellix.docker.engine.DockerClientConfig
+import de.gesellix.docker.engine.DockerEnv
+import de.gesellix.docker.remote.api.ContainerInspectResponse
+import de.gesellix.docker.remote.api.ContainerState
+import de.gesellix.docker.remote.api.core.ClientException
+import org.apache.commons.io.FileUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.nio.file.Files
+import java.nio.file.Path
+
+class bitbucketContainerTest extends Specification {
+
+    @Shared
+    static Logger log = LoggerFactory.getLogger(bitbucketContainerTest.class)
+
+    @Shared
+    DockerClientImpl dockerClient
+
+
+    @Shared
+    String dockerRemoteHost = "https://docker.domain.se:2376"
+    @Shared
+    String dockerCertPath = "resources/dockerCert"
+    @Shared
+    String bitbucketBaseUrl = "http://bitbucket.domain.se:7990/"
+
+
+    def setupSpec() {
+        dockerClient = resolveDockerClient()
+        dockerClient.stop("Bitbucket")
+        dockerClient.rm("Bitbucket")
+    }
+
+
+
+    def "sandbox"() {
+
+        setup:
+        dockerClient.manageImage.build()
+    }
+
+    def "test setupContainer"() {
+        setup:
+        log.info("Testing setup of BB container using trait method")
+        BitbucketContainer bbc = new BitbucketContainer(dockerRemoteHost, dockerCertPath)
+        BitbucketInstanceManagerRest bbr = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
+
+        bbc.jvmMaxRam = 4096
+
+        when:
+        String containerId = bbc.createContainer()
+        ContainerInspectResponse containerInspect =  dockerClient.inspectContainer(containerId).content
+
+
+        then:
+        assert containerInspect.name ==  "/" + bbc.containerName : "BB was not given the expected name"
+        assert containerInspect.state.status == ContainerState.Status.Created : "BB Container status is of unexpected value"
+        assert containerInspect.state.running == false : "BB Container was started even though it should only have been created"
+        assert dockerClient.inspectImage(containerInspect.image).content.repoTags.find {it == "atlassian/bitbucket:latest"} : "BB container was created with incorrect Docker image"
+        assert containerInspect.hostConfig.portBindings.containsKey("7990/tcp") : "BB Container port binding was not setup correctly"
+        log.info("\tBB Container was setup correctly")
+
+        expect:
+        bbc.startContainer()
+        bbr.setApplicationProperties(new File("resources/bitbucket/licenses/bitbucketLicense").text)
+        bbr.status == "RUNNING"
+
+
+
+    }
+
+
+
+
+    DockerClientImpl resolveDockerClient() {
+
+        if (this.dockerClient) {
+            return this.dockerClient
+        }
+
+        log.info("Getting Docker client")
+
+        if (!dockerRemoteHost) {
+            log.info("\tNo remote host configured, returning local docker connection")
+            return new DockerClientImpl()
+        }
+
+        File certDir = new File(dockerCertPath)
+
+        if (!certDir.isDirectory()) {
+            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
+            return new DockerClientImpl()
+        }
+        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
+        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
+        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
+
+
+        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
+            log.info("\tFound Docker certs, returning Secure remote Docker connection")
+            try {
+                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
+                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
+                return dockerClient
+            } catch (ex) {
+                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
+                log.info("\tReturning local Docker connection")
+                return new DockerClientImpl()
+            }
+
+        }
+
+        log.info("\tMissing Docker certs, returning local docker connection")
+
+        return new DockerClientImpl()
+
+    }
+
+    /**
+     * Replaced the default docker connection (local) with a remote, secure one
+     * @param host ex: "https://docker.domain.se:2376"
+     * @param certPath folder containing ca.pem, cert.pem, key.pem
+     */
+    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
+
+        DockerClientConfig dockerConfig = new DockerClientConfig(host)
+        DockerEnv dockerEnv = new DockerEnv(host)
+        dockerEnv.setCertPath(certPath)
+        dockerEnv.setTlsVerify("1")
+        dockerConfig.apply(dockerEnv)
+
+        return new DockerClientImpl(dockerConfig)
+
+    }
+}

From 35c2d969481140fe7d50b569190f75565b2a5194 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 8 Sep 2022 18:02:29 +0200
Subject: [PATCH 02/17] Added customEnvVar to JsmContainer, consider adding it
 to interface instead

---
 .../com/eficode/devstack/container/impl/JsmContainer.groovy  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index a57f833..b34c662 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -10,6 +10,7 @@ class JsmContainer implements Container{
 
     String containerName = "JSM"
     String containerMainPort = "8080"
+    ArrayList <String> customEnvVar = [] //Ex: ["key=value", "PATH=/user/local/sbin"]
     String containerImage = "atlassian/jira-servicemanagement"
     String containerImageTag = "latest"
     long jvmMaxRam = 6000
@@ -41,7 +42,7 @@ class JsmContainer implements Container{
         ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->
 
             c.image = imageName + ":" + imageTag
-            c.env = ["JVM_MAXIMUM_MEMORY=" + jsmMaxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((jsmMaxRamMB / 2) as String) + "m"]
+            c.env = ["JVM_MAXIMUM_MEMORY=" + jsmMaxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((jsmMaxRamMB / 2) as String) + "m"] + customEnvVar
             c.exposedPorts = [(jsmPort + "/tcp"): [:]]
             c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(jsmPort+"/tcp"): [new PortBinding("0.0.0.0", (jsmPort))]] }
 
@@ -49,6 +50,8 @@ class JsmContainer implements Container{
 
 
 
+
+
         //EngineResponseContent response = dockerClient.run(containerCreateRequest, jsmContainerName)
         EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, jsmContainerName)
         assert response.content.warnings.isEmpty(): "Error when creating $jsmContainerName container:" + response.content.warnings.join(",")

From 36113a0ae07b8abbc81dd52101efc95a3aeed6e4 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 9 Sep 2022 18:02:27 +0200
Subject: [PATCH 03/17] Added runOnFirstStartup to containers Started added
 network related methods to Container.groovy, testing in progress

---
 pom.xml                                       |  2 +-
 .../container/impl/AlpineContainer.groovy     | 57 ++++++++++++
 .../container/impl/BitbucketContainer.groovy  |  5 ++
 .../container/impl/JsmContainer.groovy        | 33 +++++--
 .../container/impl/NginxContainer.groovy      |  5 ++
 .../impl/JsmAndBitbucketH2Deployment.groovy   | 90 +++++++++++++++++++
 .../deployment/impl/JsmH2Deployment.groovy    |  5 +-
 .../devstack/container/ContainerTest.groovy   | 60 ++++++++++++-
 .../impl/bitbucketContainerTest.groovy        |  2 +-
 .../impl/JsmH2DeploymentTest.groovy           |  3 +-
 10 files changed, 242 insertions(+), 20 deletions(-)
 create mode 100644 src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
 create mode 100644 src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy

diff --git a/pom.xml b/pom.xml
index 39b474c..38947c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>jirainstancemanger</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
new file mode 100644
index 0000000..42c5587
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
@@ -0,0 +1,57 @@
+package com.eficode.devstack.container.impl
+
+import com.eficode.devstack.container.Container
+import de.gesellix.docker.client.EngineResponseContent
+import de.gesellix.docker.remote.api.ContainerCreateRequest
+import de.gesellix.docker.remote.api.HostConfig
+import de.gesellix.docker.remote.api.PortBinding
+
+class AlpineContainer implements Container {
+
+    String containerName = "Alpine"
+    String containerMainPort = null
+    String containerImage = "alpine"
+    String containerImageTag = "latest"
+
+
+    AlpineContainer() {}
+
+    /**
+     * Setup a secure connection to a remote docker
+     * @param dockerHost ex: https://docker.domain.com:2376
+     * @param dockerCertPath ex: src/test/resources/dockerCert
+     */
+    AlpineContainer(String dockerHost, String dockerCertPath) {
+        assert setupSecureRemoteConnection(dockerHost, dockerCertPath): "Error setting up secure remote docker connection"
+    }
+
+
+    String createContainer() {
+
+        assert ping(): "Error connecting to docker engine"
+
+        ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->
+
+            c.image = containerImage + ":" + containerImageTag
+            c.hostname = containerName
+
+
+        }
+
+        EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, containerName)
+        assert response.content.warnings.isEmpty(): "Error when creating $containerName container:" + response.content.warnings.join(",")
+
+        containerId = response.content.id
+        return containerId
+
+    }
+
+
+    boolean runOnFirstStartup() {
+        log.debug("\tUpdating apt and installing dependencies")
+        assert runBashCommandInContainer("apt update; apt install -y htop nano; echo \$?", 20).last() == "0"
+
+        return true
+    }
+
+}
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
index e7b5915..cfbc4b0 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -49,6 +49,7 @@ class BitbucketContainer implements Container{
             c.env = ["JVM_MAXIMUM_MEMORY=" + maxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((maxRamMB / 2) as String) + "m"]
             c.exposedPorts = [(mainPort + "/tcp"): [:]]
             c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(mainPort + "/tcp"): [new PortBinding("0.0.0.0", (mainPort.toString()))]] }
+            c.hostname = containerName
 
         }
 
@@ -63,6 +64,10 @@ class BitbucketContainer implements Container{
     }
 
 
+    boolean runOnFirstStartup() {
+        return true
+    }
+
 
 
 }
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index fa20064..4feb5d2 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -4,13 +4,14 @@ import com.eficode.devstack.container.Container
 import de.gesellix.docker.client.EngineResponseContent
 import de.gesellix.docker.remote.api.ContainerCreateRequest
 import de.gesellix.docker.remote.api.HostConfig
+import de.gesellix.docker.remote.api.NetworkingConfig
 import de.gesellix.docker.remote.api.PortBinding
 
-class JsmContainer implements Container{
+class JsmContainer implements Container {
 
     String containerName = "JSM"
     String containerMainPort = "8080"
-    ArrayList <String> customEnvVar = [] //Ex: ["key=value", "PATH=/user/local/sbin"]
+    ArrayList<String> customEnvVar = [] //Ex: ["key=value", "PATH=/user/local/sbin"]
     String containerImage = "atlassian/jira-servicemanagement"
     String containerImageTag = "latest"
     long jvmMaxRam = 6000
@@ -19,11 +20,11 @@ class JsmContainer implements Container{
 
     /**
      * Setup a secure connection to a remote docker
-     * @param dockerHost  ex: https://docker.domain.com:2376
+     * @param dockerHost ex: https://docker.domain.com:2376
      * @param dockerCertPath ex: src/test/resources/dockerCert
      */
     JsmContainer(String dockerHost, String dockerCertPath) {
-       assert setupSecureRemoteConnection(dockerHost, dockerCertPath) : "Error setting up secure remote docker connection"
+        assert setupSecureRemoteConnection(dockerHost, dockerCertPath): "Error setting up secure remote docker connection"
     }
 
 
@@ -40,7 +41,7 @@ class JsmContainer implements Container{
 
     String createJsmContainer(String jsmContainerName = containerName, String imageName = containerImage, String imageTag = containerImageTag, long jsmMaxRamMB = jvmMaxRam, String jsmPort = containerMainPort) {
 
-        assert ping(),  "Error Connecting to docker engine"
+        assert ping(), "Error Connecting to docker engine"
 
 
         ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->
@@ -48,14 +49,12 @@ class JsmContainer implements Container{
             c.image = imageName + ":" + imageTag
             c.env = ["JVM_MAXIMUM_MEMORY=" + jsmMaxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((jsmMaxRamMB / 2) as String) + "m"] + customEnvVar
             c.exposedPorts = [(jsmPort + "/tcp"): [:]]
-            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(jsmPort+"/tcp"): [new PortBinding("0.0.0.0", (jsmPort))]] }
+            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(jsmPort + "/tcp"): [new PortBinding("0.0.0.0", (jsmPort))]] }
+            c.hostname = containerName.toLowerCase()
 
         }
 
 
-
-
-
         //EngineResponseContent response = dockerClient.run(containerCreateRequest, jsmContainerName)
         EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, jsmContainerName)
         assert response.content.warnings.isEmpty(): "Error when creating $jsmContainerName container:" + response.content.warnings.join(",")
@@ -66,4 +65,20 @@ class JsmContainer implements Container{
 
     }
 
+
+
+
+    boolean runOnFirstStartup() {
+
+        log.debug("\tCreating folders needed for running Spoc tests with ScriptRunner")
+        assert runBashCommandInContainer("mkdir  /opt/atlassian/jira/surefire-reports ; chown jira:jira  /opt/atlassian/jira/surefire-reports").empty
+        log.debug("\tUpdating apt and installing dependencies")
+        assert runBashCommandInContainer("apt update; apt install -y htop nano; echo \$?", 20).last() == "0"
+
+        return true
+
+
+    }
+
+
 }
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
index b134ce2..35f3627 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
@@ -55,6 +55,7 @@ class NginxContainer implements Container{
                 h.portBindings = [(containerMainPort+"/tcp"): [new PortBinding("0.0.0.0", (containerMainPort))]]
                 h.mounts = this.mounts
             }
+            c.hostname = containerName
 
 
         }
@@ -69,4 +70,8 @@ class NginxContainer implements Container{
 
 
     }
+
+    boolean runOnFirstStartup() {
+        return true
+    }
 }
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
new file mode 100644
index 0000000..5628ad9
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
@@ -0,0 +1,90 @@
+package com.eficode.devstack.deployment.impl
+
+import com.eficode.atlassian.bitbucketInstanceManager.BitbucketInstanceManagerRest
+import com.eficode.atlassian.jiraInstanceManger.JiraInstanceMangerRest
+import com.eficode.devstack.container.Container
+import com.eficode.devstack.container.impl.BitbucketContainer
+import com.eficode.devstack.container.impl.JsmContainer
+import com.eficode.devstack.deployment.Deployment
+
+class JsmAndBitbucketH2Deployment implements Deployment{
+
+    String friendlyName = "JIRA and Bitbucket H2 Deployment"
+    ArrayList<Container> containers = []
+
+    Map<String, String> jiraAppsToInstall = [:]
+    String jiraLicense
+    String jiraBaseUrl
+    JiraInstanceMangerRest jiraRest
+
+    String bitbucketBaseUrl
+    BitbucketInstanceManagerRest bitbucketRest
+
+    JsmAndBitbucketH2Deployment(String jiraBaseUrl, String bitbucketBaseUrl) {
+
+        this.jiraBaseUrl = jiraBaseUrl
+        this.jiraRest = new JiraInstanceMangerRest(jiraBaseUrl)
+
+        this.bitbucketBaseUrl = bitbucketBaseUrl
+        this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
+
+        this.containers = [new JsmContainer(), new BitbucketContainer()]
+
+    }
+
+    JsmContainer getJsmContainer() {
+        return containers.find{it instanceof JsmContainer} as JsmContainer
+    }
+
+    BitbucketContainer getBitbucketContainer() {
+        return containers.find {it instanceof BitbucketContainer} as BitbucketContainer
+    }
+
+    void setJiraLicense(String licenseText) {
+        this.jiraLicense = licenseText
+    }
+
+    void setBitbucketLicense(String licenseText) {
+
+        this.bitbucketLicense = licenseText
+    }
+
+    /**
+     * Install apps in to JIRA
+     * @param appsAndLicenses key = App url (from marketplace), value = license string (optional)
+     * @return true if no apps where installed, or apps where installed successfully
+     */
+    boolean installJiraApps(Map<String,String> appsAndLicenses = jiraAppsToInstall) {
+
+        if (appsAndLicenses) {
+            log.info("Installing ${appsAndLicenses.size()} app(s)")
+            appsAndLicenses.each {url, license ->
+                assert jiraRest.installApp(url, license) : "Error installing app:" + url
+            }
+        }
+
+        return true
+
+    }
+
+    boolean setupDeployment() {
+
+        log.info("Setting up deployment:" + friendlyName)
+
+        log.info("\tStarting setup of JSM container")
+        jsmContainer.createContainer()
+        log.info("\t\tCreated JSM container:" + jsmContainer.id)
+        assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
+        log.info("\tStarted JSM container")
+
+        jiraRest.setApplicationProperties(jiraLicense, "JIRA", jiraBaseUrl)
+
+
+
+
+
+
+    }
+
+
+}
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
index 72142e0..96f40f7 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -79,10 +79,7 @@ class JsmH2Deployment implements Deployment{
         assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
         log.info("\tStarted JSM container")
 
-        log.debug("\tCreating folders needed for running Spoc tests with ScriptRunner")
-        assert jsmContainer.runBashCommandInContainer("mkdir  /opt/atlassian/jira/surefire-reports ; chown jira:jira  /opt/atlassian/jira/surefire-reports").empty
-        log.debug("\tUpdating apt and installing dependencies")
-        jsmContainer.runBashCommandInContainer("apt update; apt install -y htop nano", 20)
+
 
         log.info("\tSetting up local H2 database")
         assert jiraRest.setupH2Database() : "Error setting up H2 database for JSM"
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index 5dc9692..f742500 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -1,13 +1,12 @@
 package com.eficode.devstack.container
 
+import com.eficode.devstack.container.impl.AlpineContainer
+import de.gesellix.docker.remote.api.Network
 import groovy.io.FileType
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import spock.lang.Specification
 
-import java.nio.file.Files
-import java.nio.file.Path
-
 class ContainerTest extends Specification {
 
     static Logger log = LoggerFactory.getLogger(ContainerTest.class)
@@ -21,7 +20,14 @@ class ContainerTest extends Specification {
         String containerName = "spoc"
         String containerMainPort = "666"
 
-        String createContainer() {}
+        String createContainer() {
+            return ""
+        }
+
+        @Override
+        boolean runOnFirstStartup() {
+            return true
+        }
     }
 
 
@@ -35,6 +41,52 @@ class ContainerTest extends Specification {
         expect:
         container.ping()
 
+    }
+
+
+    def testNetworking() {
+
+
+        setup:
+        String networkName = "spock-network"
+        log.info("Testing CRUD of networks")
+        AlpineContainer alpine = new AlpineContainer(dockerHost, dockerCertPath)
+        alpine.containerName = "spock-alpine"
+        alpine.stopAndRemoveContainer()
+        //alpine.createContainer()
+
+        log.info("\tCreated SPOCK container:" + alpine.id)
+
+        Network spocNetwork = AlpineContainer.getBridgeNetwork()
+        if (spocNetwork) {
+
+            assert AlpineContainer.removeBridgeNetwork(spocNetwork.id) : "Error removing pre-existing SPOCK network"
+            log.info("\tRemoved pre-existing spoc-network")
+        }
+
+        when:
+        log.info("\tTesting removing network that should not exist")
+        AlpineContainer.removeBridgeNetwork(networkName)
+        then:
+        AssertionError ex = thrown(AssertionError)
+        ex.message.startsWith("Could not find")
+        log.info("\t\tSuccess, error was thrown:" + ex.message)
+
+
+        when:
+        Network newNetwork = AlpineContainer.createBridgeNetwork(networkName)
+        log.info("\tCreated spock network:" + newNetwork?.id)
+
+        then:
+        newNetwork != null
+
+
+
+        //alpine.deleteBridgeNetwork("hejhej")
+        //assert AlpineContainer.deleteBridgeNetwork("host") == null : "Error the spock network already exists"
+
+
+
     }
 
     def testCreateTar() {
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
index 31b8658..9723150 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
@@ -30,7 +30,7 @@ class bitbucketContainerTest extends Specification {
     @Shared
     String dockerCertPath = "resources/dockerCert"
     @Shared
-    String bitbucketBaseUrl = "http://bitbucket.domain.se:7990/"
+    String bitbucketBaseUrl = "http://bitbucket.domain.se:7990"
 
 
     def setupSpec() {
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
index 94885e6..6988c05 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -17,7 +17,8 @@ class JsmH2DeploymentTest extends Specification {
     String dockerCertPath = "resources/dockerCert"
 
     @Shared
-    String jiraBaseUrl = "http://192.168.0.1:8080"
+    //String jiraBaseUrl = "http://192.168.0.1:8080"
+    String jiraBaseUrl = "http://docker.domain.se:8080"
     //String jiraBaseUrl = "http://localhost:8080"
 
     @Shared

From b509e282eb8b0aa4937f3131dbbd290aedf0e9c1 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 12 Sep 2022 09:18:54 +0200
Subject: [PATCH 04/17] Started adding networking to Containers interface

---
 .../devstack/container/Container.groovy       | 119 ++++++++++++++++--
 1 file changed, 110 insertions(+), 9 deletions(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 518f359..4517205 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -1,12 +1,16 @@
 package com.eficode.devstack.container
 
 import de.gesellix.docker.client.DockerClientImpl
+import de.gesellix.docker.client.network.ManageNetworkClient
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
 import de.gesellix.docker.engine.EngineResponse
 import de.gesellix.docker.remote.api.ContainerInspectResponse
+import de.gesellix.docker.remote.api.ContainerState
 import de.gesellix.docker.remote.api.IdResponse
 import de.gesellix.docker.remote.api.Mount
+import de.gesellix.docker.remote.api.Network
+import de.gesellix.docker.remote.api.NetworkCreateRequest
 import de.gesellix.docker.remote.api.core.ClientException
 import de.gesellix.docker.remote.api.core.Frame
 import de.gesellix.docker.remote.api.core.StreamCallback
@@ -29,17 +33,18 @@ trait Container {
 
     static Logger log = LoggerFactory.getLogger(Container.class)
     static DockerClientImpl dockerClient = new DockerClientImpl()
+    static ManageNetworkClient networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
     abstract String containerName
     abstract String containerMainPort
     String containerId
     ArrayList<Mount> mounts = []
 
 
-    void prepareBindMount(String sourceAbs, String target, boolean readOnly = true){
-        assert !isCreated() : "Bind mounts cant be prepared for already created container"
+    void prepareBindMount(String sourceAbs, String target, boolean readOnly = true) {
+        assert !isCreated(): "Bind mounts cant be prepared for already created container"
 
         this.mounts.add(
-                new Mount().tap{m ->
+                new Mount().tap { m ->
                     m.source = sourceAbs
                     m.target = target
                     m.readOnly = readOnly
@@ -49,10 +54,10 @@ trait Container {
     }
 
 
-
-
     abstract String createContainer()
 
+    abstract boolean runOnFirstStartup()
+
 
     /**
      * Replaced the default docker connection (local) with a remote, secure one
@@ -67,11 +72,17 @@ trait Container {
         dockerEnv.setTlsVerify("1")
         dockerConfig.apply(dockerEnv)
         dockerClient = new DockerClientImpl(dockerConfig)
+        networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
+
+
+
         return ping()
 
     }
 
 
+
+
     boolean ping() {
         try {
             return dockerClient.ping().content as String == "OK"
@@ -118,8 +129,15 @@ trait Container {
 
     boolean startContainer() {
 
+
+        boolean firstStartup = hasNeverBeenStarted()
         dockerClient.startContainer(self.containerId)
 
+        if (firstStartup) {
+            assert runOnFirstStartup(): "Error running initial startup commands inside of the container"
+        }
+
+
         return isRunning()
     }
 
@@ -131,7 +149,17 @@ trait Container {
         return inspect().state.running
     }
 
-    String getIp(){
+
+    /**
+     * Returns true if the container has been created but never started
+     * @return
+     */
+    boolean hasNeverBeenStarted() {
+
+        return inspect().state.status == ContainerState.Status.Created
+    }
+
+    String getIp() {
         inspect().networkSettings.ipAddress
     }
 
@@ -152,7 +180,7 @@ trait Container {
                 }
             }
             return false
-        }else {
+        } else {
             return false
         }
 
@@ -259,6 +287,81 @@ trait Container {
     }
 
 
+    /**
+     * Creates a network of the type bridge, or returns an existing one if one with the same name exists
+     * @param networkName name of the network
+     * @return the created/existing network
+     */
+    static Network createBridgeNetwork(def networkName) {
+
+        log.info("Creating network:" + networkName)
+
+
+
+        Network existingNetwork = getBridgeNetwork(networkName)
+
+        if (existingNetwork) {
+            log.info("\tNetwork already exists (${existingNetwork.id}), returning that.")
+            return existingNetwork
+        }
+
+
+        NetworkCreateRequest createRequest = new NetworkCreateRequest(networkName, false, "bridge", null, null, null, null, null, [:], null)
+
+
+        String networkId = networkClient.createNetwork(createRequest).content.id
+        assert networkId: "Error creating network:" + networkName
+        log.info("\tCreated:" + networkId)
+
+        Network newNetwork = networkClient.networks([filters: [id: [networkId]]])?.content?.first()
+        assert newNetwork: "Error finding newly created network $networkName with id: " + networkId
+
+        return newNetwork
+    }
+
+
+    static Boolean removeBridgeNetwork(String networkId) {
+
+
+        log.info("Removing bridge network:" + networkId)
+
+        Network network = networkClient.networks().content.find { it.id == networkId && it.driver == "bridge" }
+        assert network : "Could not find a bridge network with ID:" + networkId
+        networkClient.rmNetwork(network.id)
+
+        return networkClient.networks([filters: [id: [network.id]]])?.content?.isEmpty()
+
+    }
+
+    /**
+     * Gets a bridge network based on name, note there might be multiple networks with the same name
+     * @param networkName
+     * @return null or one of the matching networks
+     */
+    static Network getBridgeNetwork(String networkName) {
+
+
+        Network network = networkClient.networks().content.find { it.name == networkName && it.driver == "bridge" }
+
+        return network
+    }
+
+    boolean addContainerToNetwork(String networkId) {
+
+
+        networkClient.connectNetwork(networkId, containerId)
+
+
+        def here = networkClient.inspectNetwork(networkId).content.containers
+
+        return false
+
+
+    }
+
+
+
+
     /**
      * Copy files from a container
      * @param containerPath can be a file or a path (ending in /)
@@ -319,12 +422,10 @@ trait Container {
         }
 
 
-
         ContainerCallback callBack = new ContainerCallback()
         EngineResponse<IdResponse> response = dockerClient.exec(self.containerId, ["/bin/bash", "-c", command], callBack, Duration.ofSeconds(timeoutS))
 
 
-
         return callBack.output
     }
 

From de5bb3cbc57d6d85f137d1dd0600f4ea65317673 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 12 Sep 2022 17:42:09 +0200
Subject: [PATCH 05/17] Minor bugfixes

---
 .../devstack/container/Container.groovy        | 15 +++++++++++++--
 .../container/impl/JsmContainer.groovy         | 18 +++++++++++++++++-
 .../devstack/container/ContainerTest.groovy    |  2 ++
 .../deployment/impl/JsmH2DeploymentTest.groovy |  2 ++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 4517205..5d83082 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -118,6 +118,7 @@ trait Container {
         log.info("\tResolving container ID for:" + self.containerName)
 
 
+
         ArrayList<Map> content = dockerClient.ps().content
 
         Map container = content.find { it.Names.first() == "/" + self.containerName }
@@ -142,7 +143,7 @@ trait Container {
     }
 
     ContainerInspectResponse inspect() {
-        return dockerClient.inspectContainer(self.containerId).content
+        return self.containerId ? dockerClient.inspectContainer(self.containerId).content : null
     }
 
     boolean isRunning() {
@@ -156,7 +157,16 @@ trait Container {
      */
     boolean hasNeverBeenStarted() {
 
-        return inspect().state.status == ContainerState.Status.Created
+        ContainerState.Status status = inspect()?.state?.status
+
+        if (status == ContainerState.Status.Created ) {
+            return true //Created but not started
+        }else if (status == null) {
+            return true //Not even created
+        }else {
+            return false
+        }
+
     }
 
     String getIp() {
@@ -176,6 +186,7 @@ trait Container {
             } catch (ClientException ex) {
 
                 if (ex.response.message == "Not Found") {
+                    containerId = null
                     return true
                 }
             }
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index 4feb5d2..5a42e6d 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -11,7 +11,7 @@ class JsmContainer implements Container {
 
     String containerName = "JSM"
     String containerMainPort = "8080"
-    ArrayList<String> customEnvVar = [] //Ex: ["key=value", "PATH=/user/local/sbin"]
+    ArrayList<String> customEnvVar = []
     String containerImage = "atlassian/jira-servicemanagement"
     String containerImageTag = "latest"
     long jvmMaxRam = 6000
@@ -66,10 +66,26 @@ class JsmContainer implements Container {
     }
 
 
+    /**
+     * Set custom environmental variables. Must be set before creating container
+     * @param keyVar Ex: ["key=value", "PATH=/user/local/sbin"]
+     */
+    void setCustomEnvVar(ArrayList<String> keyVar) {
+
+        assert hasNeverBeenStarted(): "Error, cant set custom enviromental variables after creating container"
+
+        this.customEnvVar = keyVar
+    }
 
 
     boolean runOnFirstStartup() {
 
+        ArrayList<String> initialOut = runBashCommandInContainer("echo END")
+        initialOut.remove { "END" }
+        if (initialOut) {
+            log.warn("StdOut contains unexpected output on initial startup:")
+            initialOut.each { log.warn("\t" + it) }
+        }
         log.debug("\tCreating folders needed for running Spoc tests with ScriptRunner")
         assert runBashCommandInContainer("mkdir  /opt/atlassian/jira/surefire-reports ; chown jira:jira  /opt/atlassian/jira/surefire-reports").empty
         log.debug("\tUpdating apt and installing dependencies")
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index f742500..bb387ce 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -44,8 +44,10 @@ class ContainerTest extends Specification {
     }
 
 
+
     def testNetworking() {
 
+        //TODO continue this
 
         setup:
         String networkName = "spock-network"
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
index 6988c05..3d50fe3 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -61,6 +61,8 @@ class JsmH2DeploymentTest extends Specification {
     }
 
 
+
+
     DockerClientImpl resolveDockerClient() {
 
         if (this.dockerClient) {

From 377fb0a06a31e90174c363d35f0550130e5b7e40 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 16 Sep 2022 14:49:04 +0200
Subject: [PATCH 06/17] Updated to use the new JiraInstanceManager and
 bitbucketinstancemanager Added Deployment for Bitbucket H2

---
 pom.xml                                       |  28 ++---
 .../devstack/container/Container.groovy       |   4 +-
 .../container/impl/BitbucketContainer.groovy  |   2 +-
 .../devstack/deployment/Deployment.groovy     |   3 +-
 .../impl/BitbucketH2Deployment.groovy         |  68 ++++++++++
 .../impl/JsmAndBitbucketH2Deployment.groovy   |  43 ++++++-
 .../deployment/impl/JsmH2Deployment.groovy    |   6 +-
 ...t.groovy => BitbucketContainerTest.groovy} |  10 +-
 .../impl/BitbucketH2DeploymentTest.groovy     | 118 ++++++++++++++++++
 9 files changed, 247 insertions(+), 35 deletions(-)
 create mode 100644 src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
 rename src/test/groovy/com/eficode/devstack/container/impl/{bitbucketContainerTest.groovy => BitbucketContainerTest.groovy} (94%)
 create mode 100644 src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy

diff --git a/pom.xml b/pom.xml
index 38947c2..35ced89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,20 +9,8 @@
     <version>1.0.6-SNAPSHOT</version>
     <description>A series of scripts for setting up common developer application suites</description>
 
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>Eficode Devstack</name>
-            <url>https://maven.pkg.github.com/eficode/devStack</url>
-        </repository>
-    </distributionManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>com.eficode.atlassian</groupId>
-            <artifactId>bitbucketinstancemanager</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
@@ -64,8 +52,14 @@
         </dependency>
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
-            <artifactId>jirainstancemanger</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <artifactId>jirainstancemanager</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>bitbucketinstancemanager</artifactId>
+            <version>0.0.3-SNAPSHOT-groovy-3.0</version>
+            <classifier>standalone</classifier>
         </dependency>
 
 
@@ -74,7 +68,11 @@
     <repositories>
         <repository>
             <id>eficode-github-jiraManagerRest</id>
-            <url>https://github.com/eficode/JiraInstanceMangerRest/raw/packages/repository/</url>
+            <url>https://github.com/eficode/JiraInstanceManagerRest/raw/packages/repository/</url>
+        </repository>
+        <repository>
+            <id>eficode-github-BitbucketInstanceManagerRest</id>
+            <url>https://github.com/eficode/BitbucketInstanceManagerRest/raw/packages/repository/</url>
         </repository>
     </repositories>
     <build>
diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 5d83082..9b8dcc6 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -147,7 +147,7 @@ trait Container {
     }
 
     boolean isRunning() {
-        return inspect().state.running
+        return inspect()?.state?.running
     }
 
 
@@ -200,7 +200,7 @@ trait Container {
 
     boolean stopContainer() {
         log.info("Stopping container:" + self.containerId)
-        dockerClient.stop(self.containerId, 240000)
+        running ? dockerClient.stop(self.containerId, 240000) : ""
         if (running) {
             log.warn("\tFailed to stop container" + self.containerId)
             return false
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
index cfbc4b0..659c34a 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -12,7 +12,7 @@ class BitbucketContainer implements Container{
     String containerMainPort = "7990"
     String containerImage = "atlassian/bitbucket"
     String containerImageTag = "latest"
-    long jvmMaxRam = 2048
+    long jvmMaxRam = 4096
 
 
     /**
diff --git a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
index e1f9e27..6ef7efd 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
@@ -30,6 +30,7 @@ trait Deployment {
 
 
     boolean startDeployment() {
+
         log.info("Starting deployment: " + this.friendlyName)
 
         this.containers.each { container ->
@@ -46,7 +47,7 @@ trait Deployment {
         log.info("Stopping deployment: " + this.getFriendlyName())
 
 
-        getContainers().each { container ->
+        this.getContainers().each { container ->
             log.debug("\tStopping container:" + container.containerName)
             assert container.stopContainer(): "Error stopping container:" + container.containerId
         }
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
new file mode 100644
index 0000000..0bbd4d4
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
@@ -0,0 +1,68 @@
+package com.eficode.devstack.deployment.impl
+
+import com.eficode.atlassian.bitbucketInstanceManager.BitbucketInstanceManagerRest
+import com.eficode.devstack.container.Container
+import com.eficode.devstack.container.impl.BitbucketContainer
+import com.eficode.devstack.deployment.Deployment
+
+class BitbucketH2Deployment implements Deployment{
+
+    String friendlyName = "Bitbucket H2 Deployment"
+    BitbucketInstanceManagerRest bitbucketRest
+    ArrayList<Container> containers = []
+
+    String bitbucketLicense
+    String bitbucketBaseUrl
+
+    BitbucketH2Deployment(String bitbucketBaseUrl) {
+
+        this.bitbucketBaseUrl = bitbucketBaseUrl
+        this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
+        this.containers = [new BitbucketContainer()]
+
+    }
+
+    BitbucketContainer getBitbucketContainer() {
+        return containers.find {it instanceof BitbucketContainer} as BitbucketContainer
+    }
+
+    String getBitbucketContainerId() {
+        return bitbucketContainer.id
+    }
+
+    void setBitbucketLicence(File licenseFile) {
+        bitbucketLicense = licenseFile.text
+    }
+
+    void setBitbucketLicence(String licenseText) {
+        bitbucketLicense = licenseText
+    }
+
+
+    boolean setupDeployment() {
+
+        log.info("Setting up deployment:" + friendlyName)
+
+        assert bitbucketLicense : "Error no Bitbucket License has been setup"
+
+        bitbucketContainer.createContainer()
+        log.info("\tCreated Bitbucket container:" + bitbucketContainer.id)
+        assert bitbucketContainer.startContainer() : "Error starting Bitbucket container:" + bitbucketContainer.id
+        log.info("\tStarted Bitbucket container")
+
+
+
+        log.info("\tSetting up local H2 database, License, Name etc")
+        assert bitbucketRest.setApplicationProperties(bitbucketLicense, "Bitbucket", bitbucketBaseUrl) : "Error setting up H2 database for Bitbucket"
+        log.info("\t\tApplication basics setup successfully")
+
+
+        log.info("\tBitbucket deployment finished, you should now be able to login")
+        log.info("\t\tUrl:" + bitbucketBaseUrl)
+        log.info("\t\tUsername:" + bitbucketRest.adminUsername)
+        log.info("\t\tPassword:" + bitbucketRest.adminPassword)
+
+        return true
+
+    }
+}
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
index 5628ad9..dcaa261 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
@@ -1,7 +1,7 @@
 package com.eficode.devstack.deployment.impl
 
 import com.eficode.atlassian.bitbucketInstanceManager.BitbucketInstanceManagerRest
-import com.eficode.atlassian.jiraInstanceManger.JiraInstanceMangerRest
+import com.eficode.atlassian.jiraInstanceManager.JiraInstanceManagerRest
 import com.eficode.devstack.container.Container
 import com.eficode.devstack.container.impl.BitbucketContainer
 import com.eficode.devstack.container.impl.JsmContainer
@@ -15,7 +15,7 @@ class JsmAndBitbucketH2Deployment implements Deployment{
     Map<String, String> jiraAppsToInstall = [:]
     String jiraLicense
     String jiraBaseUrl
-    JiraInstanceMangerRest jiraRest
+    JiraInstanceManagerRest jiraRest
 
     String bitbucketBaseUrl
     BitbucketInstanceManagerRest bitbucketRest
@@ -23,13 +23,17 @@ class JsmAndBitbucketH2Deployment implements Deployment{
     JsmAndBitbucketH2Deployment(String jiraBaseUrl, String bitbucketBaseUrl) {
 
         this.jiraBaseUrl = jiraBaseUrl
-        this.jiraRest = new JiraInstanceMangerRest(jiraBaseUrl)
+        this.jiraRest = new JiraInstanceManagerRest(jiraBaseUrl)
 
         this.bitbucketBaseUrl = bitbucketBaseUrl
         this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
 
+        log.info("jira:" + this.jiraRest.baseUrl)
+        log.info("bitbucket:" + this.bitbucketRest.baseUrl)
         this.containers = [new JsmContainer(), new BitbucketContainer()]
 
+
+
     }
 
     JsmContainer getJsmContainer() {
@@ -71,18 +75,45 @@ class JsmAndBitbucketH2Deployment implements Deployment{
 
         log.info("Setting up deployment:" + friendlyName)
 
-        log.info("\tStarting setup of JSM container")
+        assert jiraLicense : "Error no Jira License has been setup"
+
         jsmContainer.createContainer()
-        log.info("\t\tCreated JSM container:" + jsmContainer.id)
+        log.info("\tCreated jsm container:" + jsmContainer.id)
         assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
         log.info("\tStarted JSM container")
 
-        jiraRest.setApplicationProperties(jiraLicense, "JIRA", jiraBaseUrl)
+        log.info("\tSetting up local H2 database")
+        assert jiraRest.setupH2Database() : "Error setting up H2 database for JSM"
+        log.info("\t\tDatabase setup successfully")
+        log.info("\tSetting up application properties and Jira license")
+        assert jiraRest.setApplicationProperties(jiraLicense, "JIRA", jiraBaseUrl)
+        log.info("\t\tLicense and properties setup successfully")
+
+        if(jiraAppsToInstall) {
+            installApps()
+        }
+
+
 
+        return false
 
+    }
 
+    /**
+     * Install apps in to JIRA
+     * @param appsAndLicenses key = App url (from marketplace), value = license string (optional)
+     * @return true if no apps where installed, or apps where installed successfully
+     */
+    boolean installApps(Map<String,String> appsAndLicenses = jiraAppsToInstall ) {
 
+        if (appsAndLicenses) {
+            log.info("Installing ${appsAndLicenses.size()} app(s)")
+            appsAndLicenses.each {url, license ->
+                assert jiraRest.installApp(url, license) : "Error installing app:" + url
+            }
+        }
 
+        return true
 
     }
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
index 96f40f7..98dbb5b 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -1,6 +1,6 @@
 package com.eficode.devstack.deployment.impl
 
-import com.eficode.atlassian.jiraInstanceManger.JiraInstanceMangerRest
+import com.eficode.atlassian.jiraInstanceManager.JiraInstanceManagerRest
 import com.eficode.devstack.container.Container
 import com.eficode.devstack.container.impl.JsmContainer
 import com.eficode.devstack.deployment.Deployment
@@ -8,7 +8,7 @@ import com.eficode.devstack.deployment.Deployment
 class JsmH2Deployment implements Deployment{
 
     String friendlyName = "JIRA H2 Deployment"
-    JiraInstanceMangerRest jiraRest
+    JiraInstanceManagerRest jiraRest
     ArrayList<Container> containers = []
     Map<String,String> appsToInstall = [:]
     String jiraLicense
@@ -17,7 +17,7 @@ class JsmH2Deployment implements Deployment{
 
     JsmH2Deployment(String jiraBaseUrl) {
         this.jiraBaseUrl = jiraBaseUrl
-        this.jiraRest = new JiraInstanceMangerRest(jiraBaseUrl)
+        this.jiraRest = new JiraInstanceManagerRest(jiraBaseUrl)
         this.containers = [new JsmContainer()]
     }
 
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
similarity index 94%
rename from src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
rename to src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
index 9723150..f0a0d35 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/bitbucketContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
@@ -6,20 +6,16 @@ import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
 import de.gesellix.docker.remote.api.ContainerInspectResponse
 import de.gesellix.docker.remote.api.ContainerState
-import de.gesellix.docker.remote.api.core.ClientException
 import org.apache.commons.io.FileUtils
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import spock.lang.Shared
 import spock.lang.Specification
 
-import java.nio.file.Files
-import java.nio.file.Path
-
-class bitbucketContainerTest extends Specification {
+class BitbucketContainerTest extends Specification {
 
     @Shared
-    static Logger log = LoggerFactory.getLogger(bitbucketContainerTest.class)
+    static Logger log = LoggerFactory.getLogger(BitbucketContainerTest.class)
 
     @Shared
     DockerClientImpl dockerClient
@@ -53,7 +49,7 @@ class bitbucketContainerTest extends Specification {
         BitbucketContainer bbc = new BitbucketContainer(dockerRemoteHost, dockerCertPath)
         BitbucketInstanceManagerRest bbr = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
 
-        bbc.jvmMaxRam = 4096
+        bbc.stopAndRemoveContainer()
 
         when:
         String containerId = bbc.createContainer()
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
new file mode 100644
index 0000000..a16805c
--- /dev/null
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
@@ -0,0 +1,118 @@
+package com.eficode.devstack.deployment.impl
+
+import de.gesellix.docker.client.DockerClientImpl
+import de.gesellix.docker.engine.DockerClientConfig
+import de.gesellix.docker.engine.DockerEnv
+import org.apache.commons.io.FileUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import spock.lang.Shared
+import spock.lang.Specification
+
+class BitbucketH2DeploymentTest extends Specification{
+
+    @Shared
+    static Logger log = LoggerFactory.getLogger(BitbucketH2DeploymentTest.class)
+
+    @Shared
+    DockerClientImpl dockerClient
+
+
+    @Shared
+    String dockerRemoteHost = "https://docker.domain.se:2376"
+    @Shared
+    String dockerCertPath = "resources/dockerCert"
+    @Shared
+    String bitbucketBaseUrl = "http://bitbucket.domain.se:7990"
+
+    @Shared
+    File bitbucketLicenseFile = new File("resources/bitbucket/licenses/bitbucketLicense")
+
+    def setupSpec() {
+
+
+        dockerClient = resolveDockerClient()
+        dockerClient.stop("Bitbucket")
+        dockerClient.rm("Bitbucket")
+    }
+
+
+    def "def setupDeployment"() {
+
+        setup:
+        BitbucketH2Deployment  bitbucketDep = new BitbucketH2Deployment(bitbucketBaseUrl)
+        bitbucketDep.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
+        bitbucketDep.setBitbucketLicence(bitbucketLicenseFile)
+
+
+        when:
+        boolean setupSuccess = bitbucketDep.setupDeployment()
+
+        then:
+        setupSuccess
+
+    }
+
+
+
+    DockerClientImpl resolveDockerClient() {
+
+        if (this.dockerClient) {
+            return this.dockerClient
+        }
+
+        log.info("Getting Docker client")
+
+        if (!dockerRemoteHost) {
+            log.info("\tNo remote host configured, returning local docker connection")
+            return new DockerClientImpl()
+        }
+
+        File certDir = new File(dockerCertPath)
+
+        if (!certDir.isDirectory()) {
+            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
+            return new DockerClientImpl()
+        }
+        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
+        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
+        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
+
+
+        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
+            log.info("\tFound Docker certs, returning Secure remote Docker connection")
+            try {
+                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
+                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
+                return dockerClient
+            } catch (ex) {
+                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
+                log.info("\tReturning local Docker connection")
+                return new DockerClientImpl()
+            }
+
+        }
+
+        log.info("\tMissing Docker certs, returning local docker connection")
+
+        return new DockerClientImpl()
+
+    }
+
+    /**
+     * Replaced the default docker connection (local) with a remote, secure one
+     * @param host ex: "https://docker.domain.se:2376"
+     * @param certPath folder containing ca.pem, cert.pem, key.pem
+     */
+    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
+
+        DockerClientConfig dockerConfig = new DockerClientConfig(host)
+        DockerEnv dockerEnv = new DockerEnv(host)
+        dockerEnv.setCertPath(certPath)
+        dockerEnv.setTlsVerify("1")
+        dockerConfig.apply(dockerEnv)
+
+        return new DockerClientImpl(dockerConfig)
+
+    }
+}

From b0f29cdef9561fae8c60d1fe10c3c9ae1bd41d93 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 16 Sep 2022 16:21:58 +0200
Subject: [PATCH 07/17] JsmAndBitbucketH2Deployment.groovy  Now deploys JSM and
 Bitbucket in parallel  Perhaps create a new interface superDeployment

---
 .../devstack/deployment/Deployment.groovy     |   2 -
 .../impl/JsmAndBitbucketH2Deployment.groovy   | 103 +++++++++++---
 .../JsmAndBitbucketH2DeploymentTest.groovy    | 132 ++++++++++++++++++
 3 files changed, 216 insertions(+), 21 deletions(-)
 create mode 100644 src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy

diff --git a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
index 6ef7efd..1b7440c 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
@@ -17,8 +17,6 @@ trait Deployment {
 
         log.info("Setting up secure connection to docker engine")
         assert getContainers() != null && !getContainers().empty: "Deployment has no containers defined"
-        //assert getContainers().any{! it.ping()} : "Connection has already been established."
-        //assert getContainers().created.each {!it} : "Cant setup secure connection when containers have already been created in docker engine"
 
 
         getContainers().each {
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
index dcaa261..221bc82 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
@@ -7,10 +7,15 @@ import com.eficode.devstack.container.impl.BitbucketContainer
 import com.eficode.devstack.container.impl.JsmContainer
 import com.eficode.devstack.deployment.Deployment
 
+import java.util.concurrent.Callable
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
+
 class JsmAndBitbucketH2Deployment implements Deployment{
 
     String friendlyName = "JIRA and Bitbucket H2 Deployment"
-    ArrayList<Container> containers = []
+    ArrayList<Deployment> subDeployments = []
 
     Map<String, String> jiraAppsToInstall = [:]
     String jiraLicense
@@ -19,6 +24,7 @@ class JsmAndBitbucketH2Deployment implements Deployment{
 
     String bitbucketBaseUrl
     BitbucketInstanceManagerRest bitbucketRest
+    String bitbucketLicense
 
     JsmAndBitbucketH2Deployment(String jiraBaseUrl, String bitbucketBaseUrl) {
 
@@ -28,20 +34,36 @@ class JsmAndBitbucketH2Deployment implements Deployment{
         this.bitbucketBaseUrl = bitbucketBaseUrl
         this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
 
-        log.info("jira:" + this.jiraRest.baseUrl)
-        log.info("bitbucket:" + this.bitbucketRest.baseUrl)
-        this.containers = [new JsmContainer(), new BitbucketContainer()]
+
+        this.subDeployments = [new JsmH2Deployment(jiraBaseUrl), new BitbucketH2Deployment(bitbucketBaseUrl)]
+
 
 
 
+    }
+
+    ArrayList<Container>getContainers() {
+        return [jsmContainer, bitbucketContainer]
+    }
+
+    void setContainers(ArrayList<Container> containers) {
+        this.containers = containers
+    }
+
+    JsmH2Deployment getJsmH2Deployment() {
+        return subDeployments.find{it instanceof JsmH2Deployment} as JsmH2Deployment
     }
 
     JsmContainer getJsmContainer() {
-        return containers.find{it instanceof JsmContainer} as JsmContainer
+        return jsmH2Deployment.find {it instanceof JsmContainer} as JsmContainer
+    }
+
+    BitbucketH2Deployment getBitbucketH2Deployment() {
+        return subDeployments.find{it instanceof BitbucketH2Deployment} as BitbucketH2Deployment
     }
 
     BitbucketContainer getBitbucketContainer() {
-        return containers.find {it instanceof BitbucketContainer} as BitbucketContainer
+        return bitbucketH2Deployment.find {it instanceof BitbucketContainer} as BitbucketContainer
     }
 
     void setJiraLicense(String licenseText) {
@@ -58,6 +80,7 @@ class JsmAndBitbucketH2Deployment implements Deployment{
      * @param appsAndLicenses key = App url (from marketplace), value = license string (optional)
      * @return true if no apps where installed, or apps where installed successfully
      */
+    /*
     boolean installJiraApps(Map<String,String> appsAndLicenses = jiraAppsToInstall) {
 
         if (appsAndLicenses) {
@@ -71,32 +94,73 @@ class JsmAndBitbucketH2Deployment implements Deployment{
 
     }
 
+     */
+
+
+
+    private class SetupDeploymentTask implements Callable<Boolean> {
+
+        Deployment deployment
+
+        SetupDeploymentTask(Deployment deployment) {
+            this.deployment = deployment
+        }
+
+        @Override
+        Boolean call() throws Exception {
+            this.deployment.setupDeployment()
+        }
+    }
+
     boolean setupDeployment() {
 
         log.info("Setting up deployment:" + friendlyName)
 
         assert jiraLicense : "Error no Jira License has been setup"
+        assert bitbucketLicense : "Error no Bitbucket License has been setup"
 
-        jsmContainer.createContainer()
-        log.info("\tCreated jsm container:" + jsmContainer.id)
-        assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
-        log.info("\tStarted JSM container")
+        jsmH2Deployment.setJiraLicense(new File(jiraLicense))
+        bitbucketH2Deployment.setBitbucketLicence(new File(bitbucketLicense))
 
-        log.info("\tSetting up local H2 database")
-        assert jiraRest.setupH2Database() : "Error setting up H2 database for JSM"
-        log.info("\t\tDatabase setup successfully")
-        log.info("\tSetting up application properties and Jira license")
-        assert jiraRest.setApplicationProperties(jiraLicense, "JIRA", jiraBaseUrl)
-        log.info("\t\tLicense and properties setup successfully")
 
-        if(jiraAppsToInstall) {
-            installApps()
+        ExecutorService threadPool = Executors.newFixedThreadPool(2)
+        Future jsmFuture = threadPool.submit(new SetupDeploymentTask(jsmH2Deployment))
+        Future bitbucketFuture = threadPool.submit(new SetupDeploymentTask(bitbucketH2Deployment))
+        threadPool.shutdown()
+
+        while(!jsmFuture.done || !bitbucketFuture.done) {
+            log.info("Waiting for deployments to finish")
+            log.info("\tJSM Finished:" + jsmFuture.done)
+            log.info("\tBitbucket Finished:" + bitbucketFuture.done)
+
+            if(bitbucketFuture.done) {
+                log.info("\tBitbucket deployment finished successfully:" + bitbucketFuture.get())
+            }
+
+            if(jsmFuture.done) {
+                log.info("\tJSM deployment finished successfully:" + jsmFuture.get())
+            }
+
+            sleep(5000)
+        }
+        if(bitbucketFuture.done) {
+            log.info("\tBitbucket deployment finished successfully:" + bitbucketFuture.get())
+        }
+
+        if(jsmFuture.done) {
+            log.info("\tJSM deployment finished successfully:" + jsmFuture.get())
         }
 
+        return jsmFuture.get() && bitbucketFuture.get()
 
+    }
 
-        return false
+    @Override
+    void setupSecureDockerConnection(String host, String certPath) {
 
+        subDeployments.each {deployment ->
+            deployment.setupSecureDockerConnection(host, certPath)
+        }
     }
 
     /**
@@ -118,4 +182,5 @@ class JsmAndBitbucketH2Deployment implements Deployment{
     }
 
 
+
 }
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
new file mode 100644
index 0000000..964695e
--- /dev/null
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
@@ -0,0 +1,132 @@
+package com.eficode.devstack.deployment.impl
+
+import de.gesellix.docker.client.DockerClientImpl
+import de.gesellix.docker.engine.DockerClientConfig
+import de.gesellix.docker.engine.DockerEnv
+import org.apache.commons.io.FileUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import spock.lang.Shared
+import spock.lang.Specification
+
+class JsmAndBitbucketH2DeploymentTest extends Specification{
+
+    @Shared
+    String dockerRemoteHost = "https://docker.domain.se:2376"
+    @Shared
+    String dockerCertPath = "resources/dockerCert"
+
+    @Shared
+    String jiraBaseUrl = "http://jira.domain.se:8080"
+
+    @Shared
+    String bitbucketBaseUrl = "http://bitbucket.domain.se:7990"
+
+
+    @Shared
+    DockerClientImpl dockerClient
+
+    @Shared
+    static Logger log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)
+
+    @Shared
+    File bitbucketLicenseFile = new File("resources/bitbucket/licenses/bitbucketLicense")
+
+    @Shared
+    File jsmLicenseFile = new File("resources/jira/licenses/jsm.license")
+
+
+    def setupSpec() {
+
+
+        assert jsmLicenseFile.text.length() > 10 : "Jira license file does not appear valid"
+        assert bitbucketLicenseFile.text.length() > 10 : "Bitbucket license file does not appear valid"
+        dockerClient = resolveDockerClient()
+        dockerClient.stop("JSM")
+        dockerClient.rm("JSM")
+        dockerClient.stop("Bitbucket")
+        dockerClient.rm("Bitbucket")
+    }
+
+
+    def "test setupDeployment"() {
+
+        setup:
+        JsmAndBitbucketH2Deployment jsmAndBb = new JsmAndBitbucketH2Deployment(jiraBaseUrl, bitbucketBaseUrl)
+        jsmAndBb.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
+        jsmAndBb.bitbucketLicense = bitbucketLicenseFile
+        jsmAndBb.jiraLicense = jsmLicenseFile
+
+        when:
+        boolean setupSuccess = jsmAndBb.setupDeployment()
+
+        then:
+        setupSuccess
+    }
+
+
+
+
+    DockerClientImpl resolveDockerClient() {
+
+        if (this.dockerClient) {
+            return this.dockerClient
+        }
+
+        log.info("Getting Docker client")
+
+        if (!dockerRemoteHost) {
+            log.info("\tNo remote host configured, returning local docker connection")
+            return new DockerClientImpl()
+        }
+
+        File certDir = new File(dockerCertPath)
+
+        if (!certDir.isDirectory()) {
+            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
+            return new DockerClientImpl()
+        }
+        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
+        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
+        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
+
+
+        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
+            log.info("\tFound Docker certs, returning Secure remote Docker connection")
+            try {
+                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
+                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
+                return dockerClient
+            } catch (ex) {
+                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
+                log.info("\tReturning local Docker connection")
+                return new DockerClientImpl()
+            }
+
+        }
+
+        log.info("\tMissing Docker certs, returning local docker connection")
+
+        return new DockerClientImpl()
+
+    }
+
+    /**
+     * Replaced the default docker connection (local) with a remote, secure one
+     * @param host ex: "https://docker.domain.se:2376"
+     * @param certPath folder containing ca.pem, cert.pem, key.pem
+     */
+    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
+
+        DockerClientConfig dockerConfig = new DockerClientConfig(host)
+        DockerEnv dockerEnv = new DockerEnv(host)
+        dockerEnv.setCertPath(certPath)
+        dockerEnv.setTlsVerify("1")
+        dockerConfig.apply(dockerEnv)
+
+        return new DockerClientImpl(dockerConfig)
+
+    }
+
+
+}

From a597b92abd6052b75e0ace6287ec85311fadb7e0 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 19 Sep 2022 13:52:50 +0200
Subject: [PATCH 08/17] Container.groovy  * Most of the static methods and
 fields have been removed in interface and sub-classes  * Added
 createContainer() with cmd and run parameters  * Renamed inspect() method to
 inspectContainer() to not interfere with native groovy method  *
 stopAndRemoveContainer() now kills container after timeout  * A lot of work
 on networking for containers AlpineContainer.groovy  * Now has
 createSleepyContainer()

---
 .../devstack/container/Container.groovy       | 194 +++++++++++++++---
 .../container/impl/AlpineContainer.groovy     |  25 ++-
 .../container/impl/BitbucketContainer.groovy  |  10 +
 .../container/impl/JsmContainer.groovy        |  10 +
 .../container/impl/NginxContainer.groovy      |  10 +
 .../devstack/container/ContainerTest.groovy   | 136 +++++++++---
 6 files changed, 316 insertions(+), 69 deletions(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 9b8dcc6..562d664 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -7,6 +7,7 @@ import de.gesellix.docker.engine.DockerEnv
 import de.gesellix.docker.engine.EngineResponse
 import de.gesellix.docker.remote.api.ContainerInspectResponse
 import de.gesellix.docker.remote.api.ContainerState
+import de.gesellix.docker.remote.api.EndpointSettings
 import de.gesellix.docker.remote.api.IdResponse
 import de.gesellix.docker.remote.api.Mount
 import de.gesellix.docker.remote.api.Network
@@ -31,9 +32,9 @@ import java.time.Duration
 
 trait Container {
 
-    static Logger log = LoggerFactory.getLogger(Container.class)
-    static DockerClientImpl dockerClient = new DockerClientImpl()
-    static ManageNetworkClient networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
+    Logger log = LoggerFactory.getLogger(this.class)
+    DockerClientImpl dockerClient = new DockerClientImpl()
+    ManageNetworkClient networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
     abstract String containerName
     abstract String containerMainPort
     String containerId
@@ -54,6 +55,8 @@ trait Container {
     }
 
 
+    abstract String createContainer(ArrayList<String> cmd, ArrayList<String> entrypoint)
+
     abstract String createContainer()
 
     abstract boolean runOnFirstStartup()
@@ -75,14 +78,11 @@ trait Container {
         networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
 
 
-
         return ping()
 
     }
 
 
-
-
     boolean ping() {
         try {
             return dockerClient.ping().content as String == "OK"
@@ -118,7 +118,6 @@ trait Container {
         log.info("\tResolving container ID for:" + self.containerName)
 
 
-
         ArrayList<Map> content = dockerClient.ps().content
 
         Map container = content.find { it.Names.first() == "/" + self.containerName }
@@ -131,23 +130,29 @@ trait Container {
     boolean startContainer() {
 
 
+        log.info("Starting container: ${self.containerName} (${self.containerId})")
         boolean firstStartup = hasNeverBeenStarted()
+
         dockerClient.startContainer(self.containerId)
 
+
         if (firstStartup) {
+
+            log.debug("\tThis is the first time container starts, running one time startup tasks")
             assert runOnFirstStartup(): "Error running initial startup commands inside of the container"
+            log.trace("\t\tFinished running first time startup tasks")
         }
 
 
         return isRunning()
     }
 
-    ContainerInspectResponse inspect() {
+    ContainerInspectResponse inspectContainer() {
         return self.containerId ? dockerClient.inspectContainer(self.containerId).content : null
     }
 
     boolean isRunning() {
-        return inspect()?.state?.running
+        return inspectContainer()?.state?.running
     }
 
 
@@ -157,37 +162,49 @@ trait Container {
      */
     boolean hasNeverBeenStarted() {
 
-        ContainerState.Status status = inspect()?.state?.status
+        ContainerState.Status status = inspectContainer()?.state?.status
 
-        if (status == ContainerState.Status.Created ) {
+        if (status == ContainerState.Status.Created) {
             return true //Created but not started
-        }else if (status == null) {
+        } else if (status == null) {
             return true //Not even created
-        }else {
+        } else {
             return false
         }
 
     }
 
     String getIp() {
-        inspect().networkSettings.ipAddress
+        inspectContainer().networkSettings.ipAddress
     }
 
-    boolean stopAndRemoveContainer() {
+    ContainerState.Status status() {
+        return inspectContainer().state.status
+    }
+
+    boolean stopAndRemoveContainer(Integer timeoutS = 5) {
+
+        log.info("Stopping and removing container")
+        log.info("\tContainer: ${self.containerName} (${self.containerId})")
 
         if (self.containerId) {
-            dockerClient.stop(self.containerId, 240000)
-            dockerClient.wait(self.containerId)
+
+            dockerClient.stop(self.containerId, timeoutS)
+            if (self.status() == ContainerState.Status.Running) {
+                dockerClient.kill(self.containerId)
+            }
             dockerClient.rm(self.containerId)
 
 
             try {
-                inspect()
+                inspectContainer()
             } catch (ClientException ex) {
 
                 if (ex.response.message == "Not Found") {
                     containerId = null
                     return true
+                } else {
+                    throw new InputMismatchException("Error stopping and removing container")
                 }
             }
             return false
@@ -211,7 +228,7 @@ trait Container {
     }
 
 
-    static File createTar(ArrayList<String> filePaths, String outputPath) {
+    File createTar(ArrayList<String> filePaths, String outputPath) {
 
 
         log.info("Creating tar file:" + outputPath)
@@ -265,7 +282,7 @@ trait Container {
 
     }
 
-    static ArrayList<File> extractTar(File tarFile, String outputPath) {
+    ArrayList<File> extractTar(File tarFile, String outputPath) {
 
 
         log.info("Extracting: " + tarFile.path + " (${tarFile.size() / 1024}kB)")
@@ -303,12 +320,11 @@ trait Container {
      * @param networkName name of the network
      * @return the created/existing network
      */
-    static Network createBridgeNetwork(def networkName) {
+    Network createBridgeNetwork(String networkName) {
 
         log.info("Creating network:" + networkName)
 
 
-
         Network existingNetwork = getBridgeNetwork(networkName)
 
         if (existingNetwork) {
@@ -331,13 +347,11 @@ trait Container {
     }
 
 
-    static Boolean removeBridgeNetwork(String networkId) {
+    boolean removeNetwork(Network network) {
 
 
-        log.info("Removing bridge network:" + networkId)
+        log.info("Removing network:" + network.name)
 
-        Network network = networkClient.networks().content.find { it.id == networkId && it.driver == "bridge" }
-        assert network : "Could not find a bridge network with ID:" + networkId
         networkClient.rmNetwork(network.id)
 
         return networkClient.networks([filters: [id: [network.id]]])?.content?.isEmpty()
@@ -345,32 +359,144 @@ trait Container {
     }
 
     /**
-     * Gets a bridge network based on name, note there might be multiple networks with the same name
-     * @param networkName
+     * Gets a bridge network based on name or id, note there might be multiple networks with the same name
+     * @param networkNameOrId
      * @return null or one of the matching networks
      */
-    static Network getBridgeNetwork(String networkName) {
+    Network getBridgeNetwork(String networkNameOrId) {
 
 
-        Network network = networkClient.networks().content.find { it.name == networkName && it.driver == "bridge" }
+        Network network = networkClient.networks().content.find { (it.name == networkNameOrId || it.id == networkNameOrId) && it.driver == "bridge" }
 
         return network
     }
 
-    boolean addContainerToNetwork(String networkId) {
 
+    /**
+     * Gets a network based on name or id, note there might be multiple networks with the same name
+     * @param networkNameOrId
+     * @return
+     */
+    Network getNetwork(String networkNameOrId) {
 
-        networkClient.connectNetwork(networkId, containerId)
 
+        Network network = networkClient.networks().content.find { it.name == networkNameOrId || it.id == networkNameOrId }
 
-        def here = networkClient.inspectNetwork(networkId).content.containers
+        return network
+    }
+
+    boolean networkIsValid(Network network) {
+        return getNetwork(network.id) != null
+    }
+
+    ArrayList<Network> getContainerNetworks() {
+        Map<String, EndpointSettings> rawResponse = inspectContainer().networkSettings.networks
+
+        ArrayList<Network> networks = []
+        rawResponse.keySet().each {networkId ->
+            Network network = getNetwork(networkId)
+
+            if (network != null) {
+                networks.add(network)
+            }else if (networkId) {
+                //Handle networks that the container is attached to but that have been deleted
+                Network deletedNetwork = new Network()
+                deletedNetwork.id = networkId
+                deletedNetwork.driver = "deleted"
+                networks.add(deletedNetwork)
+            }
+        }
+
+        return networks
+    }
+
+    ArrayList<Network> getContainerBridgeNetworks() {
+
+
+        return getContainerNetworks().findAll {it.driver == "bridge"}
+
+    }
+
+    /**
+     * Connect container to an existing network.
+     * Note:
+     *  A container will by default already belong to a network, so this method might connect the container to a second.
+     * @param network
+     * @return true on success
+     */
+    boolean connectContainerToNetwork(Network network) throws InputMismatchException{
+
+
+        log.info("Connecting container $containerId to network:" + network.name)
+
+        if (!networkIsValid(network)) {
+            throw new InputMismatchException("Error connecting container (${containerName}) to network: ${network.name} (${network.id}). Network is not valid")
+        }
+
+        networkClient.connectNetwork(network.id, containerId)
+        log.trace("\tVerifying container was added to network")
+
+
+        if (containerNetworks.find { it.id == network.id } != null) {
+            log.info("\tContainer was successfully added to network")
+            return true
+        }
+        log.error("\tContainer failed to be added to network")
+        throw new InputMismatchException("Error connecting container (${containerName}) to network: ${network.name} (${network.id})")
+
+
+    }
+
+    boolean disconnectContainerFromNetwork(Network network) {
+
+        log.info("Disconnecting container $containerId from network:" + network.name)
+
+        networkClient.disconnectNetwork(network.id, containerId)
+        log.trace("\tVerifying container was disconnected from network")
+
+        if (!containerNetworks.find { it.id == network.id }) {
+            log.info("\tContainer was successfully disconnected from network")
+            return true
+        }
 
         return false
 
 
     }
 
+    /**
+     * Sets networks for the container, disconnecting the container from any networks not in the list
+     * @param newNetworks A list of the networks that the container should be connected to
+     * @return true on success
+     */
+    boolean setContainerNetworks(ArrayList<Network> newNetworks) throws InputMismatchException, AssertionError{
 
+        log.info("Setting container networks")
+        log.info("\tBeginning by disconnecting any networks it should no longer be connected to")
+        ArrayList networks = containerNetworks
+        containerNetworks.each { connectedNetwork ->
+
+            if (newNetworks.id.find { newNetworkId -> newNetworkId != connectedNetwork.id }) {
+                assert disconnectContainerFromNetwork(connectedNetwork): "Error disconnecting container (${containerName}) from network: ${connectedNetwork.name} (${connectedNetwork.id})"
+                log.info("\t\tDisconnected container from network:" + connectedNetwork.name)
+            }
+
+        }
+        log.info("\tFinished disconnecting container from unwanted networks, now connecting to new networks")
+
+        ArrayList<Network>connectedNetworks = containerNetworks
+        newNetworks.each { wantedNetwork ->
+
+            if (connectedNetworks.id.find { wantedNetwork.id }) {
+                log.info("\t\tContainer already connected to ${wantedNetwork.name} (${wantedNetwork.id})")
+            } else {
+                assert connectContainerToNetwork(wantedNetwork): "Error connecting container (${containerName}) to network: ${wantedNetwork.name} (${wantedNetwork.id})"
+                log.info("\t\tConnected container to network:" + wantedNetwork.name)
+            }
+
+        }
+
+    }
 
 
     /**
@@ -441,4 +567,6 @@ trait Container {
     }
 
 
+
+
 }
\ No newline at end of file
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
index 42c5587..dfc83e0 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
@@ -25,8 +25,16 @@ class AlpineContainer implements Container {
         assert setupSecureRemoteConnection(dockerHost, dockerCertPath): "Error setting up secure remote docker connection"
     }
 
+    /**
+     * Will create an Alpine Container that will sleep indefinitely
+     * @return
+     */
+    String createSleepyContainer(){
+        return createContainer(["sleep", "infinity"], [])
+    }
 
-    String createContainer() {
+
+    String createContainer(ArrayList<String> cmd , ArrayList<String> entrypoint ) {
 
         assert ping(): "Error connecting to docker engine"
 
@@ -38,6 +46,14 @@ class AlpineContainer implements Container {
 
         }
 
+        if (cmd.size()) {
+            containerCreateRequest.cmd = cmd
+        }
+
+        if (entrypoint.size()) {
+            containerCreateRequest.entrypoint = entrypoint
+        }
+
         EngineResponseContent response = dockerClient.createContainer(containerCreateRequest, containerName)
         assert response.content.warnings.isEmpty(): "Error when creating $containerName container:" + response.content.warnings.join(",")
 
@@ -46,10 +62,13 @@ class AlpineContainer implements Container {
 
     }
 
+    String createContainer() {
+        return createContainer([], [])
+    }
+
+
 
     boolean runOnFirstStartup() {
-        log.debug("\tUpdating apt and installing dependencies")
-        assert runBashCommandInContainer("apt update; apt install -y htop nano; echo \$?", 20).last() == "0"
 
         return true
     }
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
index 659c34a..c10fba4 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -38,6 +38,16 @@ class BitbucketContainer implements Container{
 
     }
 
+    String createContainer(ArrayList<String> cmd , ArrayList<String> entrypoint ) {
+
+        if (cmd || entrypoint) {
+            throw new InputMismatchException("cmd and entrypoint cant be supplied to ${BitbucketContainer.simpleName}")
+        }
+
+        return createContainer()
+
+    }
+
     String createBbContainer(String containerName = this.containerName, String imageName = containerImage, String imageTag = containerImageTag, long maxRamMB = jvmMaxRam, String mainPort = containerMainPort) {
 
         assert dockerClient.ping().content as String == "OK", "Error Connecting to docker service"
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index 5a42e6d..bc3884f 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -39,6 +39,16 @@ class JsmContainer implements Container {
 
     }
 
+    String createContainer(ArrayList<String> cmd , ArrayList<String> entrypoint ) {
+
+        if (cmd || entrypoint) {
+            throw new InputMismatchException("cmd and entrypoint cant be supplied to ${JsmContainer.simpleName}")
+        }
+
+        return createContainer()
+
+    }
+
     String createJsmContainer(String jsmContainerName = containerName, String imageName = containerImage, String imageTag = containerImageTag, long jsmMaxRamMB = jvmMaxRam, String jsmPort = containerMainPort) {
 
         assert ping(), "Error Connecting to docker engine"
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
index 35f3627..0249e20 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/NginxContainer.groovy
@@ -31,6 +31,16 @@ class NginxContainer implements Container{
         return containerId
     }
 
+    String createContainer(ArrayList<String> cmd , ArrayList<String> entrypoint ) {
+
+        if (cmd || entrypoint) {
+            throw new InputMismatchException("cmd and entrypoint cant be supplied to ${NginxContainer.simpleName}")
+        }
+
+        return createContainer()
+
+    }
+
 
     /**
      * Bind local dir to nginx default root dir /usr/share/nginx/html
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index bb387ce..a49e706 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -24,6 +24,11 @@ class ContainerTest extends Specification {
             return ""
         }
 
+        String createContainer(ArrayList<String> cmd, ArrayList<String> entrypoint) {
+
+            return ""
+        }
+
         @Override
         boolean runOnFirstStartup() {
             return true
@@ -31,7 +36,6 @@ class ContainerTest extends Specification {
     }
 
 
-
     def testPing() {
 
         setup:
@@ -44,7 +48,6 @@ class ContainerTest extends Specification {
     }
 
 
-
     def testNetworking() {
 
         //TODO continue this
@@ -52,41 +55,110 @@ class ContainerTest extends Specification {
         setup:
         String networkName = "spock-network"
         log.info("Testing CRUD of networks")
-        AlpineContainer alpine = new AlpineContainer(dockerHost, dockerCertPath)
-        alpine.containerName = "spock-alpine"
-        alpine.stopAndRemoveContainer()
-        //alpine.createContainer()
 
-        log.info("\tCreated SPOCK container:" + alpine.id)
+        AlpineContainer alpine1 = new AlpineContainer(dockerHost, dockerCertPath)
+        alpine1.containerName = "spock-alpine1"
+
+        if (alpine1.created) {
+            assert alpine1.stopAndRemoveContainer()
+        }
+        alpine1.createSleepyContainer()
+
+        AlpineContainer alpine2 = new AlpineContainer(dockerHost, dockerCertPath)
+        alpine2.containerName = "spock-alpine2"
+        if (alpine2.created) {
+            assert alpine2.stopAndRemoveContainer()
+        }
+        alpine2.createSleepyContainer()
 
-        Network spocNetwork = AlpineContainer.getBridgeNetwork()
-        if (spocNetwork) {
 
-            assert AlpineContainer.removeBridgeNetwork(spocNetwork.id) : "Error removing pre-existing SPOCK network"
+        log.info("\tCreated SPOCK container:" + alpine1.id)
+
+        Network spockNetwork = alpine1.getBridgeNetwork(networkName)
+        Network removedNetwork = alpine1.getBridgeNetwork(networkName + "-removed")
+        if (spockNetwork) {
+
+            assert alpine1.removeNetwork(spockNetwork): "Error removing pre-existing SPOCK network"
+            log.info("\tRemoved pre-existing spoc-network")
+        }
+
+        if (removedNetwork) {
+            assert alpine1.removeNetwork(removedNetwork): "Error removing pre-existing SPOCK network"
             log.info("\tRemoved pre-existing spoc-network")
         }
 
+
+        when: "Creating two new networks, and deleting one of them"
+        spockNetwork = alpine1.createBridgeNetwork(networkName)
+        log.info("\tCreated spock network: ${spockNetwork.name} (${spockNetwork.id})")
+        removedNetwork = alpine1.createBridgeNetwork(networkName + "-removed")
+        log.info("\tCreated spock network: ${removedNetwork.name} (${removedNetwork.id})")
+        alpine1.removeNetwork(removedNetwork)
+        log.info("\tRemoved spock network:" + removedNetwork?.id)
+
+
+        then: "Methods should be able to find the non-deleted network"
+
+        spockNetwork != null
+        removedNetwork != null
+
+        alpine1.getBridgeNetwork(networkName)
+        alpine1.getBridgeNetwork(spockNetwork.id)
+        alpine1.getBridgeNetwork(networkName).name == networkName
+        alpine1.getBridgeNetwork(networkName).id == spockNetwork.id
+        alpine1.getBridgeNetwork(networkName).containers.isEmpty()
+        alpine1.getBridgeNetwork(networkName).driver == "bridge"
+        log.info("\tCreation of networks was tested successfully")
+
+
+        alpine1.removeNetwork(removedNetwork)
+        alpine1.getNetwork(removedNetwork.id) == null
+        alpine1.getNetwork(removedNetwork.name) == null
+        log.info("\tRemoval of networks was tested successfully")
+
+
+        expect:
+        alpine1.getContainerBridgeNetworks().size() == 1
+        alpine1.connectContainerToNetwork(spockNetwork)
+        alpine1.getContainerBridgeNetworks().size() == 2
+        alpine1.getContainerBridgeNetworks().find { it.id == spockNetwork.id }
+
         when:
-        log.info("\tTesting removing network that should not exist")
-        AlpineContainer.removeBridgeNetwork(networkName)
+        alpine1.connectContainerToNetwork(removedNetwork) //The API doesn't verfy if a network is valid when connecting, this is done when container starts
+
         then:
-        AssertionError ex = thrown(AssertionError)
-        ex.message.startsWith("Could not find")
-        log.info("\t\tSuccess, error was thrown:" + ex.message)
+        InputMismatchException ex = thrown(InputMismatchException)
+        ex.message.contains("Network is not valid")
+
+        when: "Setting the container network to a single network"
+        alpine1.setContainerNetworks([spockNetwork])
+
+        then: "The container default network should be disconnected and replace by the new network"
+        alpine1.getContainerBridgeNetworks() == [spockNetwork]
+        alpine1.getContainerBridgeNetworks().size() == 1
+
+
+        when: "Setting the container network to a removed network"
+        alpine1.setContainerNetworks([removedNetwork])
+
+        then: "An error should be thrown"
+        InputMismatchException ex2 = thrown(InputMismatchException)
+        ex2.message.contains("Network is not valid")
 
 
         when:
-        Network newNetwork = AlpineContainer.createBridgeNetwork(networkName)
-        log.info("\tCreated spock network:" + newNetwork?.id)
+        log.info("HERE")
+        alpine1.setContainerNetworks([spockNetwork])
+        //alpine2.setContainerNetworks([spockNetwork])
+        alpine1.startContainer()
+        //alpine2.startContainer()
 
         then:
-        newNetwork != null
-
+        true
 
 
         //alpine.deleteBridgeNetwork("hejhej")
-        //assert AlpineContainer.deleteBridgeNetwork("host") == null : "Error the spock network already exists"
-
+        //assert alpine.deleteBridgeNetwork("host") == null : "Error the spock network already exists"
 
 
     }
@@ -97,6 +169,7 @@ class ContainerTest extends Specification {
         File tarOutDir = File.createTempDir("tarOut")
         File tarSourceDir = File.createTempDir("tarSourceDir")
         File tarSourceSubDir = new File(tarSourceDir.path + "/subDir")
+        AlpineContainer alpineContainer = new AlpineContainer()
         assert tarSourceSubDir.mkdir()
 
         ArrayList<File> tarSourceRootFiles = []
@@ -104,13 +177,13 @@ class ContainerTest extends Specification {
         (0..9).each { i ->
 
 
-            File newRootFile = new File(tarSourceDir.absolutePath +  "/tarRootFile${i}.txt")
+            File newRootFile = new File(tarSourceDir.absolutePath + "/tarRootFile${i}.txt")
             newRootFile.createNewFile()
             newRootFile.write("SPOC content for root file index: $i")
             tarSourceRootFiles.add(newRootFile)
 
 
-            File newSubFile = new File(tarSourceSubDir.absolutePath +  "/tarSubFile${i}.txt")
+            File newSubFile = new File(tarSourceSubDir.absolutePath + "/tarSubFile${i}.txt")
             newSubFile.createNewFile()
             newSubFile.write("SPOC content for sub file index: $i")
             tarSourceSubFiles.add(newSubFile)
@@ -126,31 +199,30 @@ class ContainerTest extends Specification {
         log.info("\t\tTar sub files:" + tarSourceSubFiles.name.join(","))
 
         when:
-        File tarFile = ContainerImpl.createTar([tarSourceDir.absolutePath],tarOutDir.absolutePath + "/tarFile.tar" )
+        File tarFile = alpineContainer.createTar([tarSourceDir.absolutePath], tarOutDir.absolutePath + "/tarFile.tar")
 
         then:
         tarOutDir.exists()
 
         when:
-        ArrayList<File> extractedFiles = ContainerImpl.extractTar(tarFile, tarOutDir.absolutePath + "/")
+        ArrayList<File> extractedFiles = alpineContainer.extractTar(tarFile, tarOutDir.absolutePath + "/")
         ArrayList<File> allSourceFiles = tarSourceRootFiles + tarSourceSubFiles
 
         then:
-        tarOutDir.eachFileRecurse(FileType.FILES) {extractedFile ->
+        tarOutDir.eachFileRecurse(FileType.FILES) { extractedFile ->
 
-            if (extractedFile.name != tarFile.name ) {
-                File matchingSourceFile = allSourceFiles.find {it.name == extractedFile.name}
+            if (extractedFile.name != tarFile.name) {
+                File matchingSourceFile = allSourceFiles.find { it.name == extractedFile.name }
 
-                assert matchingSourceFile : "Could not find matching source file, for file found in tar:" + extractedFile.name
+                assert matchingSourceFile: "Could not find matching source file, for file found in tar:" + extractedFile.name
                 assert matchingSourceFile.text == extractedFile.text
-                assert matchingSourceFile.relativePath(tarSourceDir)  == extractedFile.relativePath(tarOutDir)
+                assert matchingSourceFile.relativePath(tarSourceDir) == extractedFile.relativePath(tarOutDir)
 
             }
 
         }
 
 
-
         cleanup:
         tarSourceDir.deleteDir() ?: log.error("Error deleting temp files:" + tarSourceDir.absolutePath)
         tarOutDir.deleteDir() ?: log.error("Error deleting temp files:" + tarOutDir.absolutePath)
@@ -158,6 +230,4 @@ class ContainerTest extends Specification {
     }
 
 
-
-
 }

From aa829a8cef67f866be4e21118eed50924531294b Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 19 Sep 2022 16:40:57 +0200
Subject: [PATCH 09/17] Container.groovy  * getIP is now getIPs to support
 multiple IPs and to resolve the IP in a more dependable fashion  * Networking
 is now done is so is testing of it

---
 .../devstack/container/Container.groovy       | 17 +++++++++++---
 .../container/impl/AlpineContainer.groovy     |  1 +
 .../devstack/container/ContainerTest.groovy   | 22 +++++++++----------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 562d664..f7ed6b2 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -37,6 +37,7 @@ trait Container {
     ManageNetworkClient networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
     abstract String containerName
     abstract String containerMainPort
+    String defaultShell = "/bin/bash"
     String containerId
     ArrayList<Mount> mounts = []
 
@@ -174,8 +175,18 @@ trait Container {
 
     }
 
-    String getIp() {
-        inspectContainer().networkSettings.ipAddress
+    ArrayList<String> getIps() {
+        ContainerInspectResponse inspectResponse = inspectContainer()
+        ArrayList<String> ips = inspectResponse.networkSettings.networks.values().ipAddress
+
+        if (inspectResponse.networkSettings.ipAddress != null ) {
+            ips.add(inspectResponse.networkSettings.ipAddress)
+            ips.unique(true)
+        }
+
+
+
+        return ips
     }
 
     ContainerState.Status status() {
@@ -560,7 +571,7 @@ trait Container {
 
 
         ContainerCallback callBack = new ContainerCallback()
-        EngineResponse<IdResponse> response = dockerClient.exec(self.containerId, ["/bin/bash", "-c", command], callBack, Duration.ofSeconds(timeoutS))
+        EngineResponse<IdResponse> response = dockerClient.exec(self.containerId, [self.defaultShell, "-c", command], callBack, Duration.ofSeconds(timeoutS))
 
 
         return callBack.output
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
index dfc83e0..570c0df 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
@@ -12,6 +12,7 @@ class AlpineContainer implements Container {
     String containerMainPort = null
     String containerImage = "alpine"
     String containerImageTag = "latest"
+    String defaultShell = "/bin/sh"
 
 
     AlpineContainer() {}
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index a49e706..315ac4c 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -60,14 +60,14 @@ class ContainerTest extends Specification {
         alpine1.containerName = "spock-alpine1"
 
         if (alpine1.created) {
-            assert alpine1.stopAndRemoveContainer()
+            assert alpine1.stopAndRemoveContainer(0)
         }
         alpine1.createSleepyContainer()
 
         AlpineContainer alpine2 = new AlpineContainer(dockerHost, dockerCertPath)
         alpine2.containerName = "spock-alpine2"
         if (alpine2.created) {
-            assert alpine2.stopAndRemoveContainer()
+            assert alpine2.stopAndRemoveContainer(0)
         }
         alpine2.createSleepyContainer()
 
@@ -146,19 +146,19 @@ class ContainerTest extends Specification {
         ex2.message.contains("Network is not valid")
 
 
-        when:
-        log.info("HERE")
+        when: "Starting both containers in the same network"
         alpine1.setContainerNetworks([spockNetwork])
-        //alpine2.setContainerNetworks([spockNetwork])
+        alpine2.setContainerNetworks([spockNetwork])
         alpine1.startContainer()
-        //alpine2.startContainer()
-
-        then:
-        true
+        alpine2.startContainer()
 
+        then: "They should both be able to ping each other using containerName and ip"
+        alpine1.runBashCommandInContainer("ping -c 1 " + alpine2.containerName).any {it.contains("0% packet loss")}
+        alpine2.runBashCommandInContainer("ping -c 1 " + alpine1.containerName).any {it.contains("0% packet loss")}
+        alpine1.runBashCommandInContainer("ping -c 1 " + alpine2.ips.first()).any {it.contains("0% packet loss")}
+        alpine2.runBashCommandInContainer("ping -c 1 " + alpine1.ips.first()).any {it.contains("0% packet loss")}
+        alpine1.runBashCommandInContainer("ping -c 1 foobar").any {it.contains("bad address")}
 
-        //alpine.deleteBridgeNetwork("hejhej")
-        //assert alpine.deleteBridgeNetwork("host") == null : "Error the spock network already exists"
 
 
     }

From 0a38f39315819251296682dd4e7a6ac0a829429c Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 19 Sep 2022 18:47:21 +0200
Subject: [PATCH 10/17] Added networking to Deployments

---
 pom.xml                                       |  2 +-
 .../devstack/container/Container.groovy       | 24 ++++++++++++--
 .../container/impl/BitbucketContainer.groovy  |  3 ++
 .../container/impl/JsmContainer.groovy        |  2 +-
 .../devstack/deployment/Deployment.groovy     | 18 +++++++++-
 .../impl/BitbucketH2Deployment.groovy         |  5 +++
 .../impl/JsmAndBitbucketH2Deployment.groovy   |  4 +++
 .../deployment/impl/JsmH2Deployment.groovy    |  5 +++
 .../devstack/container/ContainerTest.groovy   | 33 +++++++++++++++++++
 .../JsmAndBitbucketH2DeploymentTest.groovy    | 23 ++++++++-----
 10 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35ced89..ae8baf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
     <description>A series of scripts for setting up common developer application suites</description>
 
 
diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index f7ed6b2..44991a0 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -37,6 +37,7 @@ trait Container {
     ManageNetworkClient networkClient = dockerClient.getManageNetwork() as ManageNetworkClient
     abstract String containerName
     abstract String containerMainPort
+    String containerNetworkName = "bridge"
     String defaultShell = "/bin/bash"
     String containerId
     ArrayList<Mount> mounts = []
@@ -56,6 +57,8 @@ trait Container {
     }
 
 
+
+
     abstract String createContainer(ArrayList<String> cmd, ArrayList<String> entrypoint)
 
     abstract String createContainer()
@@ -131,9 +134,18 @@ trait Container {
     boolean startContainer() {
 
 
-        log.info("Starting container: ${self.containerName} (${self.containerId})")
+        log.info("Preparing to start container: ${self.containerName} (${self.containerId})")
         boolean firstStartup = hasNeverBeenStarted()
 
+
+        Network network = getNetwork(self.containerNetworkName)
+
+        if (!network) {
+            log.debug("\tContainers network is missing,creating it now")
+            network = createBridgeNetwork(self.containerNetworkName)
+        }
+
+        setContainerNetworks([network])
         dockerClient.startContainer(self.containerId)
 
 
@@ -386,7 +398,7 @@ trait Container {
     /**
      * Gets a network based on name or id, note there might be multiple networks with the same name
      * @param networkNameOrId
-     * @return
+     * @return Network if found, null if not
      */
     Network getNetwork(String networkNameOrId) {
 
@@ -579,5 +591,13 @@ trait Container {
 
 
 
+    static String extractDomainFromUrl(String url) {
+        String out = url.replaceFirst(/^https?:\/\//, "") //Remove protocol
+        out = out.replaceFirst(/:\d+\\/?.*/, "") //Remove Port and anything after
+        out = out.replaceFirst(/\/.*/, "") //Remove subdomain
+        return out
+    }
+
+
 
 }
\ No newline at end of file
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
index c10fba4..809d150 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -75,6 +75,9 @@ class BitbucketContainer implements Container{
 
 
     boolean runOnFirstStartup() {
+        log.debug("\tUpdating apt and installing dependencies")
+        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo \$?", 20).last() == "0"
+
         return true
     }
 
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index bc3884f..96d5841 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -99,7 +99,7 @@ class JsmContainer implements Container {
         log.debug("\tCreating folders needed for running Spoc tests with ScriptRunner")
         assert runBashCommandInContainer("mkdir  /opt/atlassian/jira/surefire-reports ; chown jira:jira  /opt/atlassian/jira/surefire-reports").empty
         log.debug("\tUpdating apt and installing dependencies")
-        assert runBashCommandInContainer("apt update; apt install -y htop nano; echo \$?", 20).last() == "0"
+        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo \$?", 20).last() == "0"
 
         return true
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
index 1b7440c..8c5272c 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
@@ -6,9 +6,10 @@ import org.slf4j.LoggerFactory
 
 trait Deployment {
 
-    static Logger log = LoggerFactory.getLogger(Deployment.class)
+    static Logger log = LoggerFactory.getLogger(this.class)
     abstract ArrayList<Container> containers
     abstract String friendlyName
+    String deploymentNetworkName = "bridge"
 
 
     abstract boolean setupDeployment()
@@ -41,6 +42,21 @@ trait Deployment {
 
     }
 
+    boolean stopAndRemoveDeployment() {
+
+        log.info("Stopping and removing deployment: " + this.getFriendlyName())
+
+
+        this.getContainers().each { container ->
+            log.debug("\tStopping container:" + container.containerName)
+            assert container.stopAndRemoveContainer(0): "Error stopping container:" + container.containerId
+        }
+
+        log.info("\tFinished stopping deployment")
+        return true
+
+    }
+
     boolean stopDeployment() {
         log.info("Stopping deployment: " + this.getFriendlyName())
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
index 0bbd4d4..ebde177 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
@@ -19,6 +19,7 @@ class BitbucketH2Deployment implements Deployment{
         this.bitbucketBaseUrl = bitbucketBaseUrl
         this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
         this.containers = [new BitbucketContainer()]
+        bitbucketContainer.containerName = BitbucketContainer.extractDomainFromUrl(bitbucketBaseUrl)
 
     }
 
@@ -47,6 +48,10 @@ class BitbucketH2Deployment implements Deployment{
 
         bitbucketContainer.createContainer()
         log.info("\tCreated Bitbucket container:" + bitbucketContainer.id)
+
+        log.info("\tConfiguring container to join network:" + this.deploymentNetworkName)
+        bitbucketContainer.containerNetworkName = this.deploymentNetworkName
+
         assert bitbucketContainer.startContainer() : "Error starting Bitbucket container:" + bitbucketContainer.id
         log.info("\tStarted Bitbucket container")
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
index 221bc82..d528b53 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
@@ -15,6 +15,7 @@ import java.util.concurrent.Future
 class JsmAndBitbucketH2Deployment implements Deployment{
 
     String friendlyName = "JIRA and Bitbucket H2 Deployment"
+    String containerNetworkName = "jsm_and_bitbucket"
     ArrayList<Deployment> subDeployments = []
 
     Map<String, String> jiraAppsToInstall = [:]
@@ -122,12 +123,15 @@ class JsmAndBitbucketH2Deployment implements Deployment{
         jsmH2Deployment.setJiraLicense(new File(jiraLicense))
         bitbucketH2Deployment.setBitbucketLicence(new File(bitbucketLicense))
 
+        jsmH2Deployment.deploymentNetworkName = this.containerNetworkName
+        bitbucketH2Deployment.deploymentNetworkName = this.containerNetworkName
 
         ExecutorService threadPool = Executors.newFixedThreadPool(2)
         Future jsmFuture = threadPool.submit(new SetupDeploymentTask(jsmH2Deployment))
         Future bitbucketFuture = threadPool.submit(new SetupDeploymentTask(bitbucketH2Deployment))
         threadPool.shutdown()
 
+
         while(!jsmFuture.done || !bitbucketFuture.done) {
             log.info("Waiting for deployments to finish")
             log.info("\tJSM Finished:" + jsmFuture.done)
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
index 98dbb5b..e666d64 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -19,6 +19,7 @@ class JsmH2Deployment implements Deployment{
         this.jiraBaseUrl = jiraBaseUrl
         this.jiraRest = new JiraInstanceManagerRest(jiraBaseUrl)
         this.containers = [new JsmContainer()]
+        getJsmContainer().containerName = JsmContainer.extractDomainFromUrl(jiraBaseUrl)
     }
 
     JsmContainer getJsmContainer() {
@@ -76,6 +77,10 @@ class JsmH2Deployment implements Deployment{
 
         jsmContainer.createContainer()
         log.info("\tCreated jsm container:" + jsmContainer.id)
+
+        log.info("\tConfiguring container to join network:" + this.deploymentNetworkName)
+        jsmContainer.containerNetworkName = this.deploymentNetworkName
+
         assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
         log.info("\tStarted JSM container")
 
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index 315ac4c..e17f52c 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -161,6 +161,39 @@ class ContainerTest extends Specification {
 
 
 
+    }
+
+    def "Test extractDomainFromUrl"() {
+
+        setup:
+        String expectedOutput = "host.domain.com"
+        ArrayList<String>testPatterns = [
+                "host.domain.com",
+                "host.domain.com",
+                "http://host.domain.com",
+                "https://host.domain.com",
+                "host.domain.com/",
+                "host.domain.com/",
+                "http://host.domain.com/",
+                "https://host.domain.com/",
+                "host.domain.com:8080",
+                "http://host.domain.com:8080",
+                "https://host.domain.com:8080",
+                "host.domain.com/subdomain",
+                "http://host.domain.com/subdomain",
+                "https://host.domain.com/subdomain",
+                "host.domain.com:8080/subdomain",
+                "http://host.domain.com:8080/subdomain",
+                "https://host.domain.com:8080/subdomain"
+        ]
+
+
+        expect:
+        testPatterns.each {url->
+            assert AlpineContainer.extractDomainFromUrl(url) == expectedOutput
+        }
+
+
     }
 
     def testCreateTar() {
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
index 964695e..1910e09 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
@@ -1,5 +1,6 @@
 package com.eficode.devstack.deployment.impl
 
+import com.eficode.devstack.container.impl.JsmContainer
 import de.gesellix.docker.client.DockerClientImpl
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
@@ -22,6 +23,12 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
     @Shared
     String bitbucketBaseUrl = "http://bitbucket.domain.se:7990"
 
+    @Shared
+    String jiraDomain = JsmContainer.extractDomainFromUrl(jiraBaseUrl)
+
+    @Shared
+    String bitbucketDomain = JsmContainer.extractDomainFromUrl(bitbucketBaseUrl)
+
 
     @Shared
     DockerClientImpl dockerClient
@@ -42,10 +49,10 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
         assert jsmLicenseFile.text.length() > 10 : "Jira license file does not appear valid"
         assert bitbucketLicenseFile.text.length() > 10 : "Bitbucket license file does not appear valid"
         dockerClient = resolveDockerClient()
-        dockerClient.stop("JSM")
-        dockerClient.rm("JSM")
-        dockerClient.stop("Bitbucket")
-        dockerClient.rm("Bitbucket")
+        dockerClient.stop(jiraDomain, 1)
+        dockerClient.rm(jiraDomain)
+        dockerClient.stop(bitbucketDomain, 1)
+        dockerClient.rm(bitbucketDomain)
     }
 
 
@@ -57,11 +64,11 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
         jsmAndBb.bitbucketLicense = bitbucketLicenseFile
         jsmAndBb.jiraLicense = jsmLicenseFile
 
-        when:
-        boolean setupSuccess = jsmAndBb.setupDeployment()
 
-        then:
-        setupSuccess
+        expect:
+        jsmAndBb.setupDeployment()
+        jsmAndBb.jsmContainer.runBashCommandInContainer("ping -c 1 ${bitbucketDomain}").any {it.contains("0% packet loss")}
+        jsmAndBb.bitbucketContainer.runBashCommandInContainer("ping -c 1 ${jiraDomain}").any {it.contains("0% packet loss")}
     }
 
 

From 979bd93e1cef8642ed653e6f95650e0171e8d55c Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 11:08:44 +0200
Subject: [PATCH 11/17] Working on Groovy 2 and 3 versions of the library.
 Working on a standard class for spock testing Implemented changes due to
 updates to underlying docker client library

---
 pom-2.5.xml                                   |  51 ++++++
 pom-3.0.xml                                   |  51 ++++++
 pom.xml                                       | 130 ++++++++++++---
 .../devstack/container/Container.groovy       |   9 +-
 .../container/impl/BitbucketContainer.groovy  |   2 +-
 .../container/impl/JsmContainer.groovy        |   2 +-
 .../impl/BitbucketH2Deployment.groovy         |   2 +-
 .../impl/JsmAndBitbucketH2Deployment.groovy   |   4 +-
 .../deployment/impl/JsmH2Deployment.groovy    |   2 +-
 .../eficode/devstack/simplelogger.properties  |   3 +
 .../com/eficode/devstack/DevStackSpec.groovy  | 150 ++++++++++++++++++
 .../devstack/container/ContainerTest.groovy   |   3 +-
 .../impl/BitbucketContainerTest.groovy        |   7 +-
 .../container/impl/NginxContainerTest.groovy  | 139 ++++++----------
 .../impl/BitbucketH2DeploymentTest.groovy     |   1 +
 .../JsmAndBitbucketH2DeploymentTest.groovy    |  55 +++++--
 .../impl/JsmH2DeploymentTest.groovy           |   3 +-
 src/test/groovy/simplelogger.properties       |   1 +
 18 files changed, 471 insertions(+), 144 deletions(-)
 create mode 100644 pom-2.5.xml
 create mode 100644 pom-3.0.xml
 create mode 100644 src/main/groovy/com/eficode/devstack/simplelogger.properties
 create mode 100644 src/test/groovy/com/eficode/devstack/DevStackSpec.groovy

diff --git a/pom-2.5.xml b/pom-2.5.xml
new file mode 100644
index 0000000..2102eb6
--- /dev/null
+++ b/pom-2.5.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>devstack</artifactId>
+    <version>1.0.7-SNAPSHOT-groovy-2.5</version>
+    <packaging>jar</packaging>
+
+
+    <parent>
+        <groupId>com.eficode</groupId>
+        <artifactId>devstack</artifactId>
+        <version>1.0.7-SNAPSHOT</version>
+        <relativePath>pom.xml</relativePath>
+    </parent>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>2.5.18</version>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>2.2-groovy-2.5</version>
+            <scope>test</scope>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>bitbucketinstancemanager</artifactId>
+            <version>0.0.3-SNAPSHOT-groovy-2.5</version>
+            <classifier>standalone</classifier>
+        </dependency>
+
+
+    </dependencies>
+
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/pom-3.0.xml b/pom-3.0.xml
new file mode 100644
index 0000000..fbb40d8
--- /dev/null
+++ b/pom-3.0.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>devstack</artifactId>
+    <version>1.0.7-SNAPSHOT-groovy-3.0</version>
+    <packaging>jar</packaging>
+
+
+    <parent>
+        <groupId>com.eficode</groupId>
+        <artifactId>devstack</artifactId>
+        <version>1.0.7-SNAPSHOT</version>
+        <relativePath>pom.xml</relativePath>
+    </parent>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>3.0.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>2.2-groovy-3.0</version>
+            <scope>test</scope>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>bitbucketinstancemanager</artifactId>
+            <version>0.0.3-SNAPSHOT-groovy-2.5</version>
+            <classifier>standalone</classifier>
+        </dependency>
+
+
+    </dependencies>
+
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ae8baf1..957eb13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,29 +8,29 @@
     <artifactId>devstack</artifactId>
     <version>1.0.7-SNAPSHOT</version>
     <description>A series of scripts for setting up common developer application suites</description>
+    <packaging>pom</packaging>
 
 
     <dependencies>
+
+
+
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
             <version>3.0.11</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>2.1-groovy-3.0</version>
+            <scope>compile</scope>
         </dependency>
+
         <dependency>
-            <groupId>de.gesellix</groupId>
-            <artifactId>docker-client</artifactId>
-            <version>2022-05-24T07-36-00</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
         <dependency>
@@ -44,25 +44,47 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.konghq</groupId>
-            <artifactId>unirest-java</artifactId>
-            <version>3.13.6</version>
-            <classifier>standalone</classifier>
-        </dependency>
+
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>jirainstancemanager</artifactId>
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
-            <groupId>com.eficode.atlassian</groupId>
-            <artifactId>bitbucketinstancemanager</artifactId>
-            <version>0.0.3-SNAPSHOT-groovy-3.0</version>
-            <classifier>standalone</classifier>
+            <groupId>de.gesellix</groupId>
+            <artifactId>docker-client</artifactId>
+            <version>2022-07-28T22-55-00</version>
+        </dependency>
+
+        <!--dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency-->
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
         </dependency>
 
 
+
     </dependencies>
 
     <repositories>
@@ -75,9 +97,54 @@
             <url>https://github.com/eficode/BitbucketInstanceManagerRest/raw/packages/repository/</url>
         </repository>
     </repositories>
+
     <build>
         <!--sourceDirectory>${basedir}/src/main/groovy/</sourceDirectory-->
         <plugins>
+            <plugin>
+                <!-- Configured in pluginManagement instead of plugins, because we do not want a shaded parent POM -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Will output 2 jars: the original, and the shaded one -->
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+
+                            <!-- final name of the shaded jar will be ${project.artifactId}-standalone -->
+                            <shadedClassifierName>standalone</shadedClassifierName>
+
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.codehaus.groovy:groovy</exclude>
+                                    <exclude>com.google.code.gson:gson</exclude>
+                                    <exclude>org.apache.httpcomponents</exclude>
+                                    <exclude>commons-*</exclude>
+
+                                </excludes>
+
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>kong.unirest.</pattern>
+                                    <shadedPattern>com.eficode.shaded.kong.unirest.</shadedPattern>
+                                </relocation>
+                            </relocations>
+
+                            <!-- NOTE: Any dependencies of the project will not show up in the standalone pom.
+                            This means that if those dependencies are not properly relocated and there is a class-loading conflict,
+                            user would not be able to figure out where the conflicting dependency is. -->
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -102,8 +169,12 @@
                         <goals>
                             <goal>addSources</goal>
                             <goal>addTestSources</goal>
+                            <goal>generateStubs</goal>
                             <goal>compile</goal>
+                            <goal>generateTestStubs</goal>
                             <goal>compileTests</goal>
+                            <goal>removeStubs</goal>
+                            <goal>removeTestStubs</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -127,9 +198,26 @@
                 </configuration-->
 
             </plugin>
+            <!--plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M7</version>
+                <configuration>
+                    <includes>
+                        <include>**/*Spec.class</include>
+                        <include>**/*Test.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
+
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 44991a0..72f2544 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -7,6 +7,7 @@ import de.gesellix.docker.engine.DockerEnv
 import de.gesellix.docker.engine.EngineResponse
 import de.gesellix.docker.remote.api.ContainerInspectResponse
 import de.gesellix.docker.remote.api.ContainerState
+import de.gesellix.docker.remote.api.ContainerSummary
 import de.gesellix.docker.remote.api.EndpointSettings
 import de.gesellix.docker.remote.api.IdResponse
 import de.gesellix.docker.remote.api.Mount
@@ -122,10 +123,10 @@ trait Container {
         log.info("\tResolving container ID for:" + self.containerName)
 
 
-        ArrayList<Map> content = dockerClient.ps().content
+        ArrayList<ContainerSummary> containers = dockerClient.ps().content
 
-        Map container = content.find { it.Names.first() == "/" + self.containerName }
-        this.containerId = container?.Id
+        ContainerSummary matchingContainer = containers.find { it.names.first() == "/" + self.containerName }
+        this.containerId = matchingContainer.id
         log.info("\tGot:" + this.containerId)
 
         return containerId
@@ -591,7 +592,7 @@ trait Container {
 
 
 
-    static String extractDomainFromUrl(String url) {
+    String extractDomainFromUrl(String url) {
         String out = url.replaceFirst(/^https?:\/\//, "") //Remove protocol
         out = out.replaceFirst(/:\d+\\/?.*/, "") //Remove Port and anything after
         out = out.replaceFirst(/\/.*/, "") //Remove subdomain
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
index 809d150..a89de97 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/BitbucketContainer.groovy
@@ -76,7 +76,7 @@ class BitbucketContainer implements Container{
 
     boolean runOnFirstStartup() {
         log.debug("\tUpdating apt and installing dependencies")
-        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo \$?", 20).last() == "0"
+        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo status: \$?", 20).any {it.contains("status: 0")}
 
         return true
     }
diff --git a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
index 96d5841..0d91524 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -99,7 +99,7 @@ class JsmContainer implements Container {
         log.debug("\tCreating folders needed for running Spoc tests with ScriptRunner")
         assert runBashCommandInContainer("mkdir  /opt/atlassian/jira/surefire-reports ; chown jira:jira  /opt/atlassian/jira/surefire-reports").empty
         log.debug("\tUpdating apt and installing dependencies")
-        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo \$?", 20).last() == "0"
+        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping; echo status: \$?", 20).any {it.contains("status: 0")}
 
         return true
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
index ebde177..3645260 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/BitbucketH2Deployment.groovy
@@ -19,7 +19,7 @@ class BitbucketH2Deployment implements Deployment{
         this.bitbucketBaseUrl = bitbucketBaseUrl
         this.bitbucketRest = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
         this.containers = [new BitbucketContainer()]
-        bitbucketContainer.containerName = BitbucketContainer.extractDomainFromUrl(bitbucketBaseUrl)
+        bitbucketContainer.containerName = bitbucketContainer.extractDomainFromUrl(bitbucketBaseUrl)
 
     }
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
index d528b53..f6236f0 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2Deployment.groovy
@@ -56,7 +56,7 @@ class JsmAndBitbucketH2Deployment implements Deployment{
     }
 
     JsmContainer getJsmContainer() {
-        return jsmH2Deployment.find {it instanceof JsmContainer} as JsmContainer
+        return jsmH2Deployment.jsmContainer
     }
 
     BitbucketH2Deployment getBitbucketH2Deployment() {
@@ -64,7 +64,7 @@ class JsmAndBitbucketH2Deployment implements Deployment{
     }
 
     BitbucketContainer getBitbucketContainer() {
-        return bitbucketH2Deployment.find {it instanceof BitbucketContainer} as BitbucketContainer
+        return bitbucketH2Deployment.bitbucketContainer
     }
 
     void setJiraLicense(String licenseText) {
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
index e666d64..e5c426d 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -19,7 +19,7 @@ class JsmH2Deployment implements Deployment{
         this.jiraBaseUrl = jiraBaseUrl
         this.jiraRest = new JiraInstanceManagerRest(jiraBaseUrl)
         this.containers = [new JsmContainer()]
-        getJsmContainer().containerName = JsmContainer.extractDomainFromUrl(jiraBaseUrl)
+        getJsmContainer().containerName = jsmContainer.extractDomainFromUrl(jiraBaseUrl)
     }
 
     JsmContainer getJsmContainer() {
diff --git a/src/main/groovy/com/eficode/devstack/simplelogger.properties b/src/main/groovy/com/eficode/devstack/simplelogger.properties
new file mode 100644
index 0000000..684f767
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/simplelogger.properties
@@ -0,0 +1,3 @@
+org.slf4j.simpleLogger.defaultLogLevel=trace
+org.slf4j.simpleLogger.log.de.gesellix.docker.engine=warn
+org.slf4j.simpleLogger.log.de.gesellix.docker.client=warn
diff --git a/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy b/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy
new file mode 100644
index 0000000..8f0de9b
--- /dev/null
+++ b/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy
@@ -0,0 +1,150 @@
+package com.eficode.devstack
+
+import com.eficode.devstack.deployment.impl.JsmH2DeploymentTest
+import de.gesellix.docker.client.DockerClientImpl
+import de.gesellix.docker.engine.DockerClientConfig
+import de.gesellix.docker.engine.DockerEnv
+import de.gesellix.docker.remote.api.ContainerSummary
+import org.apache.commons.io.FileUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import spock.lang.Shared
+import spock.lang.Specification
+
+class DevStackSpec extends Specification{
+
+    @Shared
+    String dockerRemoteHost = "https://docker.domain.se:2376"
+    @Shared
+    String dockerCertPath = "resources/dockerCert"
+
+    @Shared
+    DockerClientImpl dockerClient
+
+    @Shared
+    ArrayList<String> containerNames
+    @Shared
+    ArrayList<Integer> containerPorts
+
+
+    @Shared
+    static Logger log = LoggerFactory.getLogger(this.class)
+
+
+    boolean cleanupContainers() {
+
+        log.info("Cleaning up containers")
+
+        DockerClientImpl dockerClient = resolveDockerClient()
+
+        ArrayList<ContainerSummary> containers = dockerClient.ps().content
+
+        log.debug("\tThere are currenlty ${containers.size()} containers")
+        containers.each {container->
+
+            boolean nameCollision = container.names.find {existingName -> containerNames.contains("/" + existingName)}
+            boolean portCollision = container.ports.find { existingPort -> containerPorts.contains(existingPort.publicPort)}
+
+            if (nameCollision || portCollision) {
+                log.info("\tWill kill and remove container: ${container.names.join(",")} (${container.id})")
+                log.debug("\t\tContainer has matching name:" + nameCollision)
+                log.debug("\t\tContainer has matching port:" + portCollision)
+
+                if (container.state == "running") {
+                    dockerClient.kill(container.id)
+                }
+                dockerClient.rm(container.id)
+                log.info("Stopped and removed container: ${container?.names?.join(",")} (${container?.id})")
+            }
+        }
+
+
+    }
+
+
+    /**
+    def stopAndRemoveContainer(ArrayList<String> containerNames) {
+
+
+        DockerClientImpl dockerClient = resolveDockerClient()
+
+        ArrayList<ContainerSummary> containers = dockerClient.ps().content
+
+        containerNames.each {containerName ->
+
+            ContainerSummary container = containers.find { it.Names.first() == "/" + containerName }
+            String id = container?.id
+
+            if (id) {
+                if (container.state == "running") {
+                    dockerClient.kill(id)
+                }
+                dockerClient.rm(id)
+                log.info("Stopped and removed container: ${container?.names?.join(",")} (${container?.id})")
+            }
+        }
+
+
+    }
+     */
+
+    DockerClientImpl resolveDockerClient() {
+
+
+        log.info("Getting Docker client")
+
+        if (!dockerRemoteHost) {
+            log.info("\tNo remote host configured, returning local docker connection")
+            return new DockerClientImpl()
+        }
+
+        File certDir = new File(dockerCertPath)
+
+        if (!certDir.isDirectory()) {
+            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
+            return new DockerClientImpl()
+        }
+        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
+        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
+        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
+
+
+        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
+            log.info("\tFound Docker certs, returning Secure remote Docker connection")
+            try {
+                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
+                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
+                return dockerClient
+            } catch (ex) {
+                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
+                log.info("\tReturning local Docker connection")
+                return new DockerClientImpl()
+            }
+
+        }
+
+        log.info("\tMissing Docker certs, returning local docker connection")
+
+        return new DockerClientImpl()
+
+    }
+
+
+    /**
+     * Replaced the default docker connection (local) with a remote, secure one
+     * @param host ex: "https://docker.domain.se:2376"
+     * @param certPath folder containing ca.pem, cert.pem, key.pem
+     */
+    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
+
+        DockerClientConfig dockerConfig = new DockerClientConfig(host)
+        DockerEnv dockerEnv = new DockerEnv(host)
+        dockerEnv.setCertPath(certPath)
+        dockerEnv.setTlsVerify("1")
+        dockerConfig.apply(dockerEnv)
+
+        return new DockerClientImpl(dockerConfig)
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
index e17f52c..5e54ada 100644
--- a/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/ContainerTest.groovy
@@ -157,7 +157,6 @@ class ContainerTest extends Specification {
         alpine2.runBashCommandInContainer("ping -c 1 " + alpine1.containerName).any {it.contains("0% packet loss")}
         alpine1.runBashCommandInContainer("ping -c 1 " + alpine2.ips.first()).any {it.contains("0% packet loss")}
         alpine2.runBashCommandInContainer("ping -c 1 " + alpine1.ips.first()).any {it.contains("0% packet loss")}
-        alpine1.runBashCommandInContainer("ping -c 1 foobar").any {it.contains("bad address")}
 
 
 
@@ -190,7 +189,7 @@ class ContainerTest extends Specification {
 
         expect:
         testPatterns.each {url->
-            assert AlpineContainer.extractDomainFromUrl(url) == expectedOutput
+            assert new AlpineContainer().extractDomainFromUrl(url) == expectedOutput
         }
 
 
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
index f0a0d35..688f119 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/BitbucketContainerTest.groovy
@@ -37,16 +37,11 @@ class BitbucketContainerTest extends Specification {
 
 
 
-    def "sandbox"() {
-
-        setup:
-        dockerClient.manageImage.build()
-    }
-
     def "test setupContainer"() {
         setup:
         log.info("Testing setup of BB container using trait method")
         BitbucketContainer bbc = new BitbucketContainer(dockerRemoteHost, dockerCertPath)
+        bbc.containerName = bbc.extractDomainFromUrl(bitbucketBaseUrl)
         BitbucketInstanceManagerRest bbr = new BitbucketInstanceManagerRest(bitbucketBaseUrl)
 
         bbc.stopAndRemoveContainer()
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
index 506f914..d0a9742 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
@@ -1,9 +1,12 @@
 package com.eficode.devstack.container.impl
 
+import com.eficode.devstack.DevStackSpec
+import de.gesellix.docker.client.DockerClient
 import de.gesellix.docker.client.DockerClientImpl
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
 import de.gesellix.docker.remote.api.ContainerInspectResponse
+import de.gesellix.docker.remote.api.ContainerSummary
 import kong.unirest.Unirest
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.filefilter.FileFileFilter
@@ -13,57 +16,69 @@ import spock.lang.Shared
 import spock.lang.Specification
 
 
-class NginxContainerTest extends Specification {
+class NginxContainerTest extends DevStackSpec {
 
-    @Shared
-    static Logger log = LoggerFactory.getLogger(NginxContainerTest.class)
 
     @Shared
-    DockerClientImpl dockerClient
+    File localNginxRoot = new File("/")
 
-    @Shared
-    File localNginxRoot = new File("examples")
 
 
     @Shared
-    String dockerRemoteHost //= "https://docker.domain.se:2376"
-    @Shared
-    String dockerCertPath //= "resources/dockerCert"
-    @Shared
-    String nginxUrl = "http://localhost"
+    String nginxUrl = "http://docker.domain.se"
 
 
     def setupSpec() {
+
+        dockerRemoteHost = "https://docker.domain.se:2376"
+        dockerCertPath = "resources/dockerCert"
+
         dockerClient = resolveDockerClient()
-        dockerClient.stop("Nginx")
-        dockerClient.rm("Nginx")
 
-        assert localNginxRoot.listFiles().findAll{it.isFile()}.size() > 0 : "localNginxRoot must contain at least one file"
+        log = LoggerFactory.getLogger(this.class)
+
+        containerNames = ["Nginx"]
+        containerPorts = [80]
+
+
 
+
+    }
+
+    def setup() {
+        cleanupContainers()
+    }
+
+    def cleanup() {
+        cleanupContainers()
     }
 
 
     def "test default setup"() {
 
         setup:
-        NginxContainer nginxC = new NginxContainer()
+
+        NginxContainer nginxC = new NginxContainer(dockerRemoteHost, dockerCertPath)
+
 
         expect:
         nginxC.createContainer()
         nginxC.startContainer()
 
-        cleanup:
-        nginxC.stopAndRemoveContainer()
+        //cleanup:
+        //nginxC.stopAndRemoveContainer()
 
     }
 
+
     def "test setting nginx root bind dir"() {
 
         setup:
         log.info("Testing setting nginx root dir")
         log.info("\tWill use dir:" + localNginxRoot.absolutePath)
 
-        NginxContainer nginxC = new NginxContainer()
+        NginxContainer nginxC = new NginxContainer(dockerRemoteHost, dockerCertPath)
+        //stopAndRemoveContainer([nginxC.containerName])
 
         when: "bindHtmlRoot should add a mount to the mounts array"
         nginxC.bindHtmlRoot(localNginxRoot.absolutePath, true)
@@ -72,91 +87,41 @@ class NginxContainerTest extends Specification {
         nginxC.mounts.size() == 1
 
         when: "After creating the container, the inspect result should confirm the mount"
-        nginxC.createContainer()
-        nginxC.startContainer()
+        String containerId = nginxC.createContainer()
+        log.info("\tCreated container:" + containerId)
+        assert nginxC.startContainer() : "Error starting container"
         ContainerInspectResponse inspectResponse = dockerClient.inspectContainer(nginxC.id).getContent()
         log.info("\tContainer created")
 
         then:
-        inspectResponse.mounts.find {it.source == localNginxRoot.absolutePath}
+        inspectResponse.mounts.find { it.source == localNginxRoot.absolutePath }
         log.info("\tDocker API confirms mount was created")
 
-        expect: "Nginx should return the expected files"
-        log.info("\tConfirming Nginx returns files found in the bind directory")
-        localNginxRoot.listFiles().findAll {it.isFile()}.every {file ->
-            log.debug("\t"*2 + "Requesting file:" + file.name)
-            int status = Unirest.get(nginxUrl + "/" + file.name).asEmpty().status
-            log.debug("\t"*3 + "HTTP Status:" + status)
-            return status == 200
-        }
-
-        Unirest.get(nginxUrl + "/MISSINGFILE").asEmpty().status == 404
-
-
-
-
-    }
-
+        /**
+         * Needs to be reworked for remote docker engines
 
-    DockerClientImpl resolveDockerClient() {
 
-        if (this.dockerClient) {
-            return this.dockerClient
-        }
+         expect: "Nginx should return the expected files"
+         log.info("\tConfirming Nginx returns files found in the bind directory")
+         localNginxRoot.listFiles().findAll {it.isFile()}.every {file ->
+         log.debug("\t"*2 + "Requesting file:" + file.name)
+         int status = Unirest.get(nginxUrl + "/" + file.name).asEmpty().status
+         log.debug("\t"*3 + "HTTP Status:" + status)
+         return status == 200
+         }
 
-        log.info("Getting Docker client")
+         *
+         */
 
-        if (!dockerRemoteHost) {
-            log.info("\tNo remote host configured, returning local docker connection")
-            return new DockerClientImpl()
-        }
 
-        File certDir = new File(dockerCertPath)
-
-        if (!certDir.isDirectory()) {
-            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
-            return new DockerClientImpl()
-        }
-        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
-        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
-        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
-
-
-        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
-            log.info("\tFound Docker certs, returning Secure remote Docker connection")
-            try {
-                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
-                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
-                return dockerClient
-            } catch (ex) {
-                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
-                log.info("\tReturning local Docker connection")
-                return new DockerClientImpl()
-            }
+        Unirest.get(nginxUrl + "/MISSINGFILE").asEmpty().status == 404
 
-        }
 
-        log.info("\tMissing Docker certs, returning local docker connection")
+        //cleanup:
+        //nginxC.stopAndRemoveContainer()
 
-        return new DockerClientImpl()
 
     }
 
-    /**
-     * Replaced the default docker connection (local) with a remote, secure one
-     * @param host ex: "https://docker.domain.se:2376"
-     * @param certPath folder containing ca.pem, cert.pem, key.pem
-     */
-    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
-
-        DockerClientConfig dockerConfig = new DockerClientConfig(host)
-        DockerEnv dockerEnv = new DockerEnv(host)
-        dockerEnv.setCertPath(certPath)
-        dockerEnv.setTlsVerify("1")
-        dockerConfig.apply(dockerEnv)
-
-        return new DockerClientImpl(dockerConfig)
-
-    }
 
 }
\ No newline at end of file
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
index a16805c..f40f33d 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
@@ -43,6 +43,7 @@ class BitbucketH2DeploymentTest extends Specification{
         BitbucketH2Deployment  bitbucketDep = new BitbucketH2Deployment(bitbucketBaseUrl)
         bitbucketDep.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
         bitbucketDep.setBitbucketLicence(bitbucketLicenseFile)
+        bitbucketDep.stopAndRemoveDeployment()
 
 
         when:
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
index 1910e09..0454987 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
@@ -4,6 +4,7 @@ import com.eficode.devstack.container.impl.JsmContainer
 import de.gesellix.docker.client.DockerClientImpl
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
+import de.gesellix.docker.remote.api.ContainerSummary
 import org.apache.commons.io.FileUtils
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -24,14 +25,10 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
     String bitbucketBaseUrl = "http://bitbucket.domain.se:7990"
 
     @Shared
-    String jiraDomain = JsmContainer.extractDomainFromUrl(jiraBaseUrl)
+    String jiraDomain
 
     @Shared
-    String bitbucketDomain = JsmContainer.extractDomainFromUrl(bitbucketBaseUrl)
-
-
-    @Shared
-    DockerClientImpl dockerClient
+    String bitbucketDomain
 
     @Shared
     static Logger log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)
@@ -48,38 +45,62 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
 
         assert jsmLicenseFile.text.length() > 10 : "Jira license file does not appear valid"
         assert bitbucketLicenseFile.text.length() > 10 : "Bitbucket license file does not appear valid"
-        dockerClient = resolveDockerClient()
-        dockerClient.stop(jiraDomain, 1)
-        dockerClient.rm(jiraDomain)
-        dockerClient.stop(bitbucketDomain, 1)
-        dockerClient.rm(bitbucketDomain)
-    }
 
+        JsmContainer jsmContainerPlaceholder = new JsmContainer()
+        jiraDomain = jsmContainerPlaceholder.extractDomainFromUrl(jiraBaseUrl)
+        bitbucketDomain = jsmContainerPlaceholder.extractDomainFromUrl(bitbucketBaseUrl)
+    }
 
     def "test setupDeployment"() {
 
         setup:
+
+        stopAndRemoveContainer([jiraDomain, bitbucketDomain])
+
         JsmAndBitbucketH2Deployment jsmAndBb = new JsmAndBitbucketH2Deployment(jiraBaseUrl, bitbucketBaseUrl)
         jsmAndBb.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
+
         jsmAndBb.bitbucketLicense = bitbucketLicenseFile
         jsmAndBb.jiraLicense = jsmLicenseFile
 
 
         expect:
         jsmAndBb.setupDeployment()
-        jsmAndBb.jsmContainer.runBashCommandInContainer("ping -c 1 ${bitbucketDomain}").any {it.contains("0% packet loss")}
         jsmAndBb.bitbucketContainer.runBashCommandInContainer("ping -c 1 ${jiraDomain}").any {it.contains("0% packet loss")}
+        jsmAndBb.jsmContainer.runBashCommandInContainer("ping -c 1 ${bitbucketDomain}").any {it.contains("0% packet loss")}
+
     }
 
 
 
 
-    DockerClientImpl resolveDockerClient() {
+    def stopAndRemoveContainer(ArrayList<String> containerNames) {
 
-        if (this.dockerClient) {
-            return this.dockerClient
+
+        DockerClientImpl dockerClient = resolveDockerClient()
+
+        ArrayList<ContainerSummary> containers = dockerClient.ps().content
+
+        containerNames.each {containerName ->
+
+            ContainerSummary container = containers.find { it.Names.first() == "/" + containerName }
+            String id = container?.id
+
+            if (id) {
+                if (container.state == "running") {
+                    dockerClient.kill(id)
+                }
+                dockerClient.rm(id)
+                log.info("Stopped and removed container: ${container?.names?.join(",")} (${container?.id})")
+            }
         }
 
+
+    }
+
+    DockerClientImpl resolveDockerClient() {
+
+
         log.info("Getting Docker client")
 
         if (!dockerRemoteHost) {
@@ -123,7 +144,7 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
      * @param host ex: "https://docker.domain.se:2376"
      * @param certPath folder containing ca.pem, cert.pem, key.pem
      */
-    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
+    DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
 
         DockerClientConfig dockerConfig = new DockerClientConfig(host)
         DockerEnv dockerEnv = new DockerEnv(host)
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
index 3d50fe3..e05647f 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -18,7 +18,7 @@ class JsmH2DeploymentTest extends Specification {
 
     @Shared
     //String jiraBaseUrl = "http://192.168.0.1:8080"
-    String jiraBaseUrl = "http://docker.domain.se:8080"
+    String jiraBaseUrl = "http://jira.domain.se:8080"
     //String jiraBaseUrl = "http://localhost:8080"
 
     @Shared
@@ -42,6 +42,7 @@ class JsmH2DeploymentTest extends Specification {
         setup:
         JsmH2Deployment jsmDep = new JsmH2Deployment(jiraBaseUrl)
         jsmDep.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
+        jsmDep.stopAndRemoveDeployment()
         //jsmDep.jsmContainer.containerImageTag = "4.22.2"
         jsmDep.setJiraLicense(new File(projectRoot.path + "/resources/jira/licenses/jsm.license"))
         jsmDep.appsToInstall = [
diff --git a/src/test/groovy/simplelogger.properties b/src/test/groovy/simplelogger.properties
index 684f767..ac425fa 100644
--- a/src/test/groovy/simplelogger.properties
+++ b/src/test/groovy/simplelogger.properties
@@ -1,3 +1,4 @@
 org.slf4j.simpleLogger.defaultLogLevel=trace
+#org.slf4j.simpleLogger.log.org.eclipse.jgit=DEBUG
 org.slf4j.simpleLogger.log.de.gesellix.docker.engine=warn
 org.slf4j.simpleLogger.log.de.gesellix.docker.client=warn

From deb85b657af4037988bae7b6d4d4afa51ae190bb Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 15:44:47 +0200
Subject: [PATCH 12/17] Configured more of the tests to us DevStackSpec

---
 .../devstack/container/Container.groovy       |  4 +-
 .../com/eficode/devstack/DevStackSpec.groovy  | 44 ++++++++-
 .../container/impl/JsmContainerTest.groovy    | 93 +++----------------
 .../container/impl/NginxContainerTest.groovy  |  6 --
 .../JsmAndBitbucketH2DeploymentTest.groovy    |  2 +-
 .../impl/JsmH2DeploymentTest.groovy           | 90 ++++--------------
 6 files changed, 70 insertions(+), 169 deletions(-)

diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 72f2544..c9bdffc 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -101,8 +101,8 @@ trait Container {
 
     boolean isCreated() {
 
-        ArrayList<Map> content = dockerClient.ps().content
-        ArrayList<String> containerNames = content.collect { it.Names }.flatten()
+        ArrayList<ContainerSummary> content = dockerClient.ps().content
+        ArrayList<String> containerNames = content.collect { it.names }.flatten()
         return containerNames.find { it == "/" + self.containerName } != null
 
     }
diff --git a/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy b/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy
index 8f0de9b..c5ffa61 100644
--- a/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy
+++ b/src/test/groovy/com/eficode/devstack/DevStackSpec.groovy
@@ -31,24 +31,58 @@ class DevStackSpec extends Specification{
     static Logger log = LoggerFactory.getLogger(this.class)
 
 
+    def setup() {
+        cleanupContainers()
+    }
+
+    def cleanup() {
+        cleanupContainers()
+    }
+
+    def cleanupSpec() {
+        cleanupContainers()
+    }
+
+
+
     boolean cleanupContainers() {
 
-        log.info("Cleaning up containers")
+
 
         DockerClientImpl dockerClient = resolveDockerClient()
+        log.info("Cleaning up containers")
 
         ArrayList<ContainerSummary> containers = dockerClient.ps().content
 
         log.debug("\tThere are currenlty ${containers.size()} containers")
+        log.debug("\tWill remove any container named:" + containerNames.join(","))
+        log.debug("\tWill remove any container bound to ports:" + containerPorts.join(","))
         containers.each {container->
 
-            boolean nameCollision = container.names.find {existingName -> containerNames.contains("/" + existingName)}
-            boolean portCollision = container.ports.find { existingPort -> containerPorts.contains(existingPort.publicPort)}
+            boolean nameCollision = false
+            container.names.any {existingName ->
+                containerNames.any {unwantedName ->
+                    if (existingName == "/"+ unwantedName) {
+                        nameCollision = true
+                    }
+                }
+            }
+
+
+            boolean portCollision = false
+
+            container.ports.find { existingPort ->
+                containerPorts.each {unwantedPort ->
+                    if (existingPort.publicPort == unwantedPort) {
+                        portCollision = true
+                    }
+                }
+            }
 
             if (nameCollision || portCollision) {
                 log.info("\tWill kill and remove container: ${container.names.join(",")} (${container.id})")
-                log.debug("\t\tContainer has matching name:" + nameCollision)
-                log.debug("\t\tContainer has matching port:" + portCollision)
+                log.debug("\t\tContainer has matching name:" + nameCollision + " (${container.names.join(",")})")
+                log.debug("\t\tContainer has matching port:" + portCollision + " (${container.ports.publicPort.join(",")})")
 
                 if (container.state == "running") {
                     dockerClient.kill(container.id)
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
index ab7f398..1c3ff72 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
@@ -1,6 +1,6 @@
 package com.eficode.devstack.container.impl
 
-
+import com.eficode.devstack.DevStackSpec
 import de.gesellix.docker.client.DockerClientImpl
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
@@ -16,27 +16,26 @@ import spock.lang.Specification
 import java.nio.file.Files
 import java.nio.file.Path
 
-class JsmContainerTest extends Specification {
+class JsmContainerTest extends DevStackSpec {
 
-    @Shared
-    static Logger log = LoggerFactory.getLogger(JsmContainerTest.class)
 
-    @Shared
-    DockerClientImpl dockerClient
+    def setupSpec() {
 
+        dockerRemoteHost = "https://docker.domain.se:2376"
+        dockerCertPath = "resources/dockerCert"
 
-    @Shared
-    String dockerRemoteHost = "https://docker.domain.se:2376"
-    @Shared
-    String dockerCertPath = "resources/dockerCert"
+        dockerClient = resolveDockerClient()
 
+        log = LoggerFactory.getLogger(JsmContainerTest.class)
 
-    def setupSpec() {
         dockerClient = resolveDockerClient()
-        dockerClient.stop("JSM")
-        dockerClient.rm("JSM")
+
+        containerNames = ["jira.domain.se", "JSM", "Spoc-JSM"]
+        containerPorts = [8080]
     }
 
+
+
     def "test isCreated"() {
 
         when:
@@ -63,8 +62,6 @@ class JsmContainerTest extends Specification {
         !jsm.isCreated()
         log.info("\tisCreated now again returns false")
 
-        cleanup:
-        containerId ? dockerClient.rm(containerId) : ""
 
     }
 
@@ -104,8 +101,6 @@ class JsmContainerTest extends Specification {
         assert containerInspect.hostConfig.portBindings.containsKey("8080/tcp") : "JSM Container port binding was not setup correctly"
         log.info("\tJSM Container was setup correctly")
 
-        cleanup:
-        containerId ? dockerClient.rm(containerId) : ""
 
 
     }
@@ -130,8 +125,6 @@ class JsmContainerTest extends Specification {
         assert dockerClient.inspectImage(containerInspect.image).content.repoTags.find {it == "atlassian/jira-servicemanagement:4-ubuntu-jdk11"} : "JSM container was created with incorrect Docker image"
         log.info("\tJSM Container was setup correctly")
 
-        cleanup:
-        containerId ? dockerClient.rm(containerId) : ""
 
 
     }
@@ -227,75 +220,13 @@ class JsmContainerTest extends Specification {
         assert hashOutput == [ fileHash + "  " + containerDstDir + largestFile.name] : "Output from container is not formatted as expected"
 
 
-        then:
-        true
 
         cleanup:
-        jsm.stopAndRemoveContainer() ? log.info("\tDeleted JSM container") : log.info("\tError deleting JSM container")
         log.info("\tDeleting temp dir:" + tempDir.toString())
         FileUtils.deleteDirectory(tempDir.toFile())
     }
 
 
 
-    DockerClientImpl resolveDockerClient() {
-
-        if (this.dockerClient) {
-            return this.dockerClient
-        }
-
-        log.info("Getting Docker client")
-
-        if (!dockerRemoteHost) {
-            log.info("\tNo remote host configured, returning local docker connection")
-            return new DockerClientImpl()
-        }
 
-        File certDir = new File(dockerCertPath)
-
-        if (!certDir.isDirectory()) {
-            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
-            return new DockerClientImpl()
-        }
-        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
-        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
-        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
-
-
-        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
-            log.info("\tFound Docker certs, returning Secure remote Docker connection")
-            try {
-                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
-                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
-                return dockerClient
-            } catch (ex) {
-                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
-                log.info("\tReturning local Docker connection")
-                return new DockerClientImpl()
-            }
-
-        }
-
-        log.info("\tMissing Docker certs, returning local docker connection")
-
-        return new DockerClientImpl()
-
-    }
-
-    /**
-     * Replaced the default docker connection (local) with a remote, secure one
-     * @param host ex: "https://docker.domain.se:2376"
-     * @param certPath folder containing ca.pem, cert.pem, key.pem
-     */
-    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
-
-        DockerClientConfig dockerConfig = new DockerClientConfig(host)
-        DockerEnv dockerEnv = new DockerEnv(host)
-        dockerEnv.setCertPath(certPath)
-        dockerEnv.setTlsVerify("1")
-        dockerConfig.apply(dockerEnv)
-
-        return new DockerClientImpl(dockerConfig)
-
-    }
 }
diff --git a/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy b/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
index d0a9742..731bace 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/NginxContainerTest.groovy
@@ -45,13 +45,7 @@ class NginxContainerTest extends DevStackSpec {
 
     }
 
-    def setup() {
-        cleanupContainers()
-    }
 
-    def cleanup() {
-        cleanupContainers()
-    }
 
 
     def "test default setup"() {
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
index 0454987..e9fbc0a 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmAndBitbucketH2DeploymentTest.groovy
@@ -83,7 +83,7 @@ class JsmAndBitbucketH2DeploymentTest extends Specification{
 
         containerNames.each {containerName ->
 
-            ContainerSummary container = containers.find { it.Names.first() == "/" + containerName }
+            ContainerSummary container = containers.find { it.names.first() == "/" + containerName }
             String id = container?.id
 
             if (id) {
diff --git a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
index e05647f..e15e1c5 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -1,5 +1,6 @@
 package com.eficode.devstack.deployment.impl
 
+import com.eficode.devstack.DevStackSpec
 import de.gesellix.docker.client.DockerClientImpl
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
@@ -9,29 +10,29 @@ import org.slf4j.LoggerFactory
 import spock.lang.Shared
 import spock.lang.Specification
 
-class JsmH2DeploymentTest extends Specification {
+class JsmH2DeploymentTest extends DevStackSpec {
 
-    @Shared
-    String dockerRemoteHost = "https://docker.domain.se:2376"
-    @Shared
-    String dockerCertPath = "resources/dockerCert"
 
     @Shared
-    //String jiraBaseUrl = "http://192.168.0.1:8080"
     String jiraBaseUrl = "http://jira.domain.se:8080"
-    //String jiraBaseUrl = "http://localhost:8080"
-
-    @Shared
-    DockerClientImpl dockerClient
-
-    @Shared
-    static Logger log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)
 
     @Shared
     File projectRoot = new File(".")
 
     def setupSpec() {
 
+        dockerRemoteHost = "https://docker.domain.se:2376"
+        dockerCertPath = "resources/dockerCert"
+
+        dockerClient = resolveDockerClient()
+
+        log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)
+
+        dockerClient = resolveDockerClient()
+
+        containerNames = ["jira.domain.se"]
+        containerPorts = [8080]
+
 
         dockerClient = resolveDockerClient()
         dockerClient.stop("JSM")
@@ -40,10 +41,10 @@ class JsmH2DeploymentTest extends Specification {
 
     def "test setupDeployment"() {
         setup:
+
         JsmH2Deployment jsmDep = new JsmH2Deployment(jiraBaseUrl)
         jsmDep.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
-        jsmDep.stopAndRemoveDeployment()
-        //jsmDep.jsmContainer.containerImageTag = "4.22.2"
+
         jsmDep.setJiraLicense(new File(projectRoot.path + "/resources/jira/licenses/jsm.license"))
         jsmDep.appsToInstall = [
                 "https://marketplace.atlassian.com/download/apps/6820/version/1005740"  : new File(projectRoot.path + "/resources/jira/licenses/scriptrunnerForJira.license").text,
@@ -64,64 +65,5 @@ class JsmH2DeploymentTest extends Specification {
 
 
 
-    DockerClientImpl resolveDockerClient() {
-
-        if (this.dockerClient) {
-            return this.dockerClient
-        }
 
-        log.info("Getting Docker client")
-
-        if (!dockerRemoteHost) {
-            log.info("\tNo remote host configured, returning local docker connection")
-            return new DockerClientImpl()
-        }
-
-        File certDir = new File(dockerCertPath)
-
-        if (!certDir.isDirectory()) {
-            log.info("\tNo valid Docker Cert Path given, returning local docker connection")
-            return new DockerClientImpl()
-        }
-        log.info("\tLooking for docker certs in:" + certDir.absolutePath)
-        ArrayList<File> pemFiles = FileUtils.listFiles(certDir, ["pem"] as String[], false)
-        log.debug("\t\tFound pem files:" + pemFiles.name.join(","))
-
-
-        if (!pemFiles.empty && pemFiles.every { pemFile -> ["ca.pem", "cert.pem", "key.pem"].find { it == pemFile.name } }) {
-            log.info("\tFound Docker certs, returning Secure remote Docker connection")
-            try {
-                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
-                assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
-                return dockerClient
-            } catch (ex) {
-                log.error("\tError setting up connection to remote Docker engine:" + ex.message)
-                log.info("\tReturning local Docker connection")
-                return new DockerClientImpl()
-            }
-
-        }
-
-        log.info("\tMissing Docker certs, returning local docker connection")
-
-        return new DockerClientImpl()
-
-    }
-
-    /**
-     * Replaced the default docker connection (local) with a remote, secure one
-     * @param host ex: "https://docker.domain.se:2376"
-     * @param certPath folder containing ca.pem, cert.pem, key.pem
-     */
-    static DockerClientImpl setupSecureRemoteConnection(String host, String certPath) {
-
-        DockerClientConfig dockerConfig = new DockerClientConfig(host)
-        DockerEnv dockerEnv = new DockerEnv(host)
-        dockerEnv.setCertPath(certPath)
-        dockerEnv.setTlsVerify("1")
-        dockerConfig.apply(dockerEnv)
-
-        return new DockerClientImpl(dockerConfig)
-
-    }
 }

From 38684077107be00a363858eacb2b65299b01932a Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 16:00:34 +0200
Subject: [PATCH 13/17] Working on git actions

---
 .github/workflows/publish-maven-package.yml | 24 +++++++++++++--------
 pom.xml                                     |  5 +++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-maven-package.yml b/.github/workflows/publish-maven-package.yml
index cb7efc1..74739c9 100644
--- a/.github/workflows/publish-maven-package.yml
+++ b/.github/workflows/publish-maven-package.yml
@@ -35,15 +35,21 @@ jobs:
 
       - name: Install Package to packages branch
         run: |
-          MAINJAR=$(ls -1 target/*.jar  | grep -v sources\.jar) 
-          SOURCEJAR=$(ls -1 target/*.jar  | grep sources\.jar | grep -v test) 
-          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo Main JAR: $MAINJAR
-          echo Source JAR: $SOURCEJAR
-          echo Version: $VERSION
-          mkdir -p repository
-          echo Installing JAR in repository directory
-          mvn install:install-file -DpomFile=pom.xml -DlocalRepositoryPath=repository/ -Dfile="$MAINJAR" -Dsources="$SOURCEJAR" -DgeneratePom=true -DcreateChecksum=true
+          mkdir localm2
+          mkdir -p repository/com/eficode/devstack
+          
+          echo Installing parent pom file
+          mvn install:install-file -Dpackaing=pom -Dfile=pom.xml -DpomFile=pom.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
+          
+          echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
+          mvn install -f pom-2.5.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
+          
+          echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
+          mvn install -f pom-3.0.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
+          
+          echo Copying the new JAR files to repository which will be added to git branch "packages"
+          rsync -avh --checksum localm2/com/eficode/devstack repository/com/eficode/devstack
+          
           
           git config user.name github-actions
           git config user.email github-actions@github.com
diff --git a/pom.xml b/pom.xml
index 957eb13..bd61e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,12 +129,12 @@
                                 </excludes>
 
                             </artifactSet>
-                            <relocations>
+                            <!--relocations>
                                 <relocation>
                                     <pattern>kong.unirest.</pattern>
                                     <shadedPattern>com.eficode.shaded.kong.unirest.</shadedPattern>
                                 </relocation>
-                            </relocations>
+                            </relocations-->
 
                             <!-- NOTE: Any dependencies of the project will not show up in the standalone pom.
                             This means that if those dependencies are not properly relocated and there is a class-loading conflict,
@@ -212,6 +212,7 @@
                         <include>**/*Spec.class</include>
                         <include>**/*Test.java</include>
                     </includes>
+                    <skipTests>true</skipTests>
                 </configuration>
             </plugin>
         </plugins>

From 2cadaf81ac32dccb529a25f3cc9ed1475e08e6bb Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 16:05:39 +0200
Subject: [PATCH 14/17] Workflow fixes

---
 .github/workflows/publish-maven-package.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/publish-maven-package.yml b/.github/workflows/publish-maven-package.yml
index 74739c9..b533ee5 100644
--- a/.github/workflows/publish-maven-package.yml
+++ b/.github/workflows/publish-maven-package.yml
@@ -24,10 +24,6 @@ jobs:
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-      - name: Compile Groovy code and generate sources
-        run: mvn gplus:compile generate-sources package
-
-
       #Manually first (once) set up an orphaned branch:
       # git switch --orphan packages
       # git commit --allow-empty -m "Initial commit on packages branch"
@@ -44,7 +40,7 @@ jobs:
           echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
           mvn install -f pom-2.5.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
           
-          echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
+          echo Compiling, Packaging and Installing Groovy 3.0 version of library to local m2 directory
           mvn install -f pom-3.0.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
           
           echo Copying the new JAR files to repository which will be added to git branch "packages"

From 759b2dc31ce60092eb93ceb69f8a9152967fb6c9 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 17:20:49 +0200
Subject: [PATCH 15/17] Minor tweaks

---
 pom-2.5.xml | 1 +
 pom-3.0.xml | 1 +
 pom.xml     | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom-2.5.xml b/pom-2.5.xml
index 2102eb6..fea3805 100644
--- a/pom-2.5.xml
+++ b/pom-2.5.xml
@@ -4,6 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <name>DevStack for Groovy 2.5</name>
     <artifactId>devstack</artifactId>
     <version>1.0.7-SNAPSHOT-groovy-2.5</version>
     <packaging>jar</packaging>
diff --git a/pom-3.0.xml b/pom-3.0.xml
index fbb40d8..89e1c05 100644
--- a/pom-3.0.xml
+++ b/pom-3.0.xml
@@ -4,6 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <name>DevStack for Groovy 3</name>
     <artifactId>devstack</artifactId>
     <version>1.0.7-SNAPSHOT-groovy-3.0</version>
     <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index bd61e72..07c0f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,9 @@
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
     <version>1.0.7-SNAPSHOT</version>
+
+    <name>DevStack - Parent pom</name>
+
     <description>A series of scripts for setting up common developer application suites</description>
     <packaging>pom</packaging>
 
@@ -105,7 +108,7 @@
                 <!-- Configured in pluginManagement instead of plugins, because we do not want a shaded parent POM -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

From 8731c2cc5bd43b68e09d8662fe9d1e43d9ee3586 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 17:35:03 +0200
Subject: [PATCH 16/17] Cleanup

---
 .idea/compiler.xml        | 13 -------------
 .idea/jarRepositories.xml | 40 ---------------------------------------
 .idea/misc.xml            | 14 --------------
 3 files changed, 67 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/misc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 9ca2fe0..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="DevStack" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 1bb1e32..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="github" />
-      <option name="name" value="github" />
-      <option name="url" value="https://maven.pkg.github.com/eficode/JiraInstanceManagerRest" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="eficode-github-jiraManagerRest" />
-      <option name="name" value="eficode-github-jiraManagerRest" />
-      <option name="url" value="https://github.com/eficode/JiraInstanceMangerRest/raw/packages/repository/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="central" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="github" />
-      <option name="name" value="github" />
-      <option name="url" value="https://maven.pkg.github.com/eficode/devstack" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f960bc1..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11.0.11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file

From 773ceff4b6393b987429ff626722a7bf93b137fb Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 22 Sep 2022 17:44:57 +0200
Subject: [PATCH 17/17] Bumped version to 1.1.0

---
 pom-2.5.xml | 4 ++--
 pom-3.0.xml | 4 ++--
 pom.xml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom-2.5.xml b/pom-2.5.xml
index fea3805..17a8186 100644
--- a/pom-2.5.xml
+++ b/pom-2.5.xml
@@ -6,14 +6,14 @@
 
     <name>DevStack for Groovy 2.5</name>
     <artifactId>devstack</artifactId>
-    <version>1.0.7-SNAPSHOT-groovy-2.5</version>
+    <version>1.1.0-SNAPSHOT-groovy-2.5</version>
     <packaging>jar</packaging>
 
 
     <parent>
         <groupId>com.eficode</groupId>
         <artifactId>devstack</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>pom.xml</relativePath>
     </parent>
 
diff --git a/pom-3.0.xml b/pom-3.0.xml
index 89e1c05..a9819ed 100644
--- a/pom-3.0.xml
+++ b/pom-3.0.xml
@@ -6,14 +6,14 @@
 
     <name>DevStack for Groovy 3</name>
     <artifactId>devstack</artifactId>
-    <version>1.0.7-SNAPSHOT-groovy-3.0</version>
+    <version>1.1.0-SNAPSHOT-groovy-3.0</version>
     <packaging>jar</packaging>
 
 
     <parent>
         <groupId>com.eficode</groupId>
         <artifactId>devstack</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 07c0f0b..d7f32e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>DevStack - Parent pom</name>