From ee00cc722c7a3c03a48a8c04b5fc6fce1ffb4d56 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Thu, 14 Jul 2022 15:33:46 +0200
Subject: [PATCH 1/4] Major work, most of the things for JSMH2 Deployment is
 working but untested

---
 .github/publish-maven-package.yml             |  36 +++++
 .idea/jarRepositories.xml                     |  10 ++
 pom.xml                                       |  20 ++-
 .../resources => resources}/dockerCert/ca.pem |   0
 .../dockerCert/cert.pem                       |   0
 .../dockerCert/key.pem                        |   0
 ...ntainerManager.groovy => Container.groovy} |  46 ++++++-
 .../container/impl/JsmContainer.groovy        |  12 +-
 .../devstack/deployment/Deployment.groovy     |  57 ++++++++
 .../deployment/impl/JsmH2Deployment.groovy    | 109 ++++++++++++++++
 .../container/impl/JsmContainerTest.groovy    |  56 +++++++-
 .../impl/JsmH2DeploymentTest.groovy           | 123 ++++++++++++++++++
 12 files changed, 450 insertions(+), 19 deletions(-)
 create mode 100644 .github/publish-maven-package.yml
 rename {src/test/resources => resources}/dockerCert/ca.pem (100%)
 rename {src/test/resources => resources}/dockerCert/cert.pem (100%)
 rename {src/test/resources => resources}/dockerCert/key.pem (100%)
 rename src/main/groovy/com/eficode/devstack/container/{ContainerManager.groovy => Container.groovy} (84%)
 create mode 100644 src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
 create mode 100644 src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
 create mode 100644 src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy

diff --git a/.github/publish-maven-package.yml b/.github/publish-maven-package.yml
new file mode 100644
index 0000000..ca29fdf
--- /dev/null
+++ b/.github/publish-maven-package.yml
@@ -0,0 +1,36 @@
+# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
+
+name: Publish Maven Package
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          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
+        run:  mvn gplus:compile
+
+      - name: Publish Package to Github Maven Repo
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a817de8..3fc1304 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="github" />
       <option name="url" value="https://maven.pkg.github.com/eficode/JiraInstanceManagerRest" />
     </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" />
@@ -21,5 +26,10 @@
       <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/pom.xml b/pom.xml
index 22187df..2f64672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,15 @@
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
     <version>1.0-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>
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
@@ -49,6 +58,11 @@
             <version>3.13.6</version>
             <classifier>standalone</classifier>
         </dependency>
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>jirainstancemanger</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
 
     </dependencies>
@@ -74,11 +88,7 @@
                         <scope>runtime</scope>
                     </dependency>
                 </dependencies>
-                <configuration>
-                    <scripts>
-                        <script>src/main/groovy/Main.groovy</script>
-                    </scripts>
-                </configuration>
+
             </plugin>
         </plugins>
     </build>
diff --git a/src/test/resources/dockerCert/ca.pem b/resources/dockerCert/ca.pem
similarity index 100%
rename from src/test/resources/dockerCert/ca.pem
rename to resources/dockerCert/ca.pem
diff --git a/src/test/resources/dockerCert/cert.pem b/resources/dockerCert/cert.pem
similarity index 100%
rename from src/test/resources/dockerCert/cert.pem
rename to resources/dockerCert/cert.pem
diff --git a/src/test/resources/dockerCert/key.pem b/resources/dockerCert/key.pem
similarity index 100%
rename from src/test/resources/dockerCert/key.pem
rename to resources/dockerCert/key.pem
diff --git a/src/main/groovy/com/eficode/devstack/container/ContainerManager.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
similarity index 84%
rename from src/main/groovy/com/eficode/devstack/container/ContainerManager.groovy
rename to src/main/groovy/com/eficode/devstack/container/Container.groovy
index c1f4660..f66ee61 100644
--- a/src/main/groovy/com/eficode/devstack/container/ContainerManager.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -21,9 +21,9 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Duration
 
-trait ContainerManager {
+trait Container {
 
-    static Logger log = LoggerFactory.getLogger(ContainerManager.class)
+    static Logger log = LoggerFactory.getLogger(Container.class)
     static DockerClientImpl dockerClient = new DockerClientImpl()
     abstract String containerName
     abstract String containerMainPort
@@ -42,22 +42,44 @@ trait ContainerManager {
      * @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) {
+    boolean 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)
+        dockerClient = new DockerClientImpl(dockerConfig)
+        return ping()
 
     }
 
 
     boolean ping() {
-        return dockerClient.ping().content as String == "OK"
+        try {
+            return dockerClient.ping().content as String == "OK"
+        }catch(SocketException ex) {
+            log.warn("Failed to ping Docker engine:" + ex.message)
+            return false
+        }
+
+    }
+
+
+
+
+    boolean isCreated(){
+
+        ArrayList<Map> content = dockerClient.ps().content
+        ArrayList<String> containerNames = content.collect {it.Names}.flatten()
+        return containerNames.find{ it == "/" + getContainerName()} != null
+
+    }
+
+    String getId() {
+        return containerId
     }
+
     String getContainerId() {
 
         if (containerId) {
@@ -101,6 +123,18 @@ trait ContainerManager {
 
     }
 
+    boolean stopContainer() {
+        log.info("Stopping container:" + containerId)
+        dockerClient.stop(containerId, 240000)
+        if (dockerClient.inspectContainer(containerId).content.state.running) {
+            log.warn("\tFailed to stop container" + containerId)
+            return false
+        }else {
+            log.info("\tContainer stopped")
+            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 7582d18..ec5d103 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -1,15 +1,17 @@
 package com.eficode.devstack.container.impl
 
-import com.eficode.devstack.container.ContainerManager
+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 JsmContainer implements ContainerManager{
+class JsmContainer implements Container{
 
-    String containerName = "JSM-H2"
+    String containerName = "JSM"
     String containerMainPort = "8080"
+    String containerImage = "atlassian/jira-servicemanagement"
+    String containerImageTag = "latest"
     long jvmMaxRam = 6000
 
     JsmContainer() {}
@@ -20,7 +22,7 @@ class JsmContainer implements ContainerManager{
      * @param dockerCertPath ex: src/test/resources/dockerCert
      */
     JsmContainer(String dockerHost, String dockerCertPath) {
-        dockerClient = setupSecureRemoteConnection(dockerHost, dockerCertPath)
+       assert setupSecureRemoteConnection(dockerHost, dockerCertPath) : "Error setting up secure remote docker connection"
     }
 
 
@@ -31,7 +33,7 @@ class JsmContainer implements ContainerManager{
 
     }
 
-    String createJsmContainer(String jsmContainerName = containerName, String imageName = "atlassian/jira-servicemanagement", String imageTag = "latest", long jsmMaxRamMB = jvmMaxRam, String jsmPort = containerMainPort) {
+    String createJsmContainer(String jsmContainerName = containerName, String imageName = containerImage, String imageTag = containerImageTag, long jsmMaxRamMB = jvmMaxRam, String jsmPort = containerMainPort) {
 
         assert dockerClient.ping().content as String == "OK", "Error Connecting to docker service"
 
diff --git a/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
new file mode 100644
index 0000000..9654518
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/deployment/Deployment.groovy
@@ -0,0 +1,57 @@
+package com.eficode.devstack.deployment
+
+import com.eficode.devstack.container.Container
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+trait Deployment {
+
+    static Logger log = LoggerFactory.getLogger(Deployment.class)
+    abstract ArrayList<Container> containers
+    abstract String friendlyName
+
+
+    abstract boolean setupDeployment()
+
+    void setupSecureDockerConnection(String host, String certPath) {
+
+        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 {
+            assert it.setupSecureRemoteConnection(host, certPath) : "Error setting up secure connection to docker engine"
+            log.info("\tSecure connection setup for container:" + getFriendlyName())
+        }
+        log.info("\tSuccessfully setup secure connections to docker engine")
+    }
+
+
+    boolean startDeployment() {
+        log.info("Starting deployment:" + friendlyName)
+
+        containers.each {container ->
+            log.debug("\tStarting:" + container.containerName)
+            assert container.startContainer() : "Error starting container:" + container.containerId
+        }
+
+        log.info("\tFinished starting deployment")
+        return true
+
+    }
+
+    boolean stopDeployment() {
+        log.info("Stopping deployment:" + friendlyName)
+
+        containers.each {container ->
+            log.debug("\tStopping:" + container.containerName)
+            assert container.stopContainer() : "Error stopping container:" + container.containerId
+        }
+
+        log.info("\tFinished stopping deployment")
+        return true
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
new file mode 100644
index 0000000..c8ca4e2
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -0,0 +1,109 @@
+package com.eficode.devstack.deployment.impl
+
+import com.eficode.atlassian.jiraInstanceManger.JiraInstanceMangerRest
+import com.eficode.devstack.container.Container
+import com.eficode.devstack.container.impl.JsmContainer
+import com.eficode.devstack.deployment.Deployment
+
+class JsmH2Deployment implements Deployment{
+
+    String friendlyName = "JIRA H2 Deployment"
+    JiraInstanceMangerRest jiraRest
+    ArrayList<Container> containers = [new JsmContainer()]
+    Map<String,String> appsToInstall = [:]
+    String jiraLicense
+
+    String jiraBaseUrl
+
+    JsmH2Deployment(String jiraBaseUrl) {
+        this.jiraBaseUrl = jiraBaseUrl
+        jiraRest = new JiraInstanceMangerRest(jiraBaseUrl)
+    }
+
+    JsmContainer getJsmContainer() {
+        return containers.find {it instanceof JsmContainer} as JsmContainer
+    }
+
+    String getJsmContainerId() {
+        return jsmContainer.id
+    }
+
+
+
+    void setJiraLicense(File licenseFile) {
+        jiraLicense = licenseFile.text
+    }
+
+    void setJiraLicense(String licenseText) {
+        jiraLicense = 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 installApps(Map<String,String> appsAndLicenses = appsToInstall) {
+
+        if (appsAndLicenses) {
+            log.info("Installing ${appsAndLicenses.size()} app(s)")
+            appsAndLicenses.each {url, license ->
+                assert jiraRest.installApp(url, license) : "Error installing app:" + url
+            }
+        }
+
+        return true
+
+    }
+
+    /**
+     * Uploads multiple new, or updates existing script files on the JIRA server
+     * @param srcDest A map where the key is a source file or folder, and value is destination file or folder, ex:
+     *     <p>"../src/someDir/someSubPath/"             :   "someDir/someSubPath/"
+     *     <p>"../src/somOtherDir/SomeScript.groovy"    :   "somOtherDir/SomeScript.groovy"
+     *
+     * @return true on success
+     */
+    boolean updateScriptrunnerFiles(Map<String,String>srcDest) {
+        jiraRest.updateScriptrunnerFiles(srcDest)
+    }
+
+    boolean setupDeployment() {
+        log.info("Setting up deployment:" + friendlyName)
+
+        assert jiraLicense : "Error no Jira 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")
+
+        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"
+        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(appsToInstall) {
+           installApps()
+       }
+
+
+        log.info("\tJSM deployment finished, you should now be able to login")
+        log.info("\t\tUrl:" + jiraBaseUrl)
+        log.info("\t\tUsername:" + jiraRest.adminUsername)
+        log.info("\t\tPassword:" + jiraRest.adminPassword)
+
+        return true
+    }
+
+
+
+
+}
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 693099a..8c8789d 100644
--- a/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/container/impl/JsmContainerTest.groovy
@@ -2,6 +2,8 @@ package com.eficode.devstack.container.impl
 
 
 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
@@ -26,14 +28,44 @@ class JsmContainerTest extends Specification {
     @Shared
     String dockerRemoteHost = "https://docker.domain.com:2376"
     @Shared
-    String dockerCertPath = "src/test/resources/dockerCert"
+    String dockerCertPath = "resources/dockerCert"
 
 
     def setupSpec() {
         dockerClient = resolveDockerClient()
-        dockerClient.rm("JSM-H2")
+        dockerClient.rm("JSM")
     }
 
+    def "test isCreated"() {
+
+        when:
+        log.info("Testing isCreated")
+        JsmContainer jsm = new JsmContainer(dockerRemoteHost, dockerCertPath)
+
+        then:
+        !jsm.isCreated()
+        log.info("\tDid not return a false positive")
+
+        when:
+        String containerId = jsm.createContainer()
+        log.info("\tCreated container:" + containerId)
+
+        then:
+        jsm.isCreated()
+        log.info("\tisCreated now returns true")
+
+        when:
+        jsm.stopAndRemoveContainer() ?: {throw new Exception("Error revoming container $containerId")}
+        log.info("\tRemoved container")
+
+        then:
+        !jsm.isCreated()
+        log.info("\tisCreated now again returns false")
+
+        cleanup:
+        containerId ? dockerClient.rm(containerId) : ""
+
+    }
 
     def "test setupSecureRemoteConnection"() {
 
@@ -48,6 +80,7 @@ class JsmContainerTest extends Specification {
         assert jsm.ping(): "Error pinging docker engine"
         assert jsm.dockerClient.dockerClientConfig.scheme == "https"
 
+
     }
 
 
@@ -231,7 +264,7 @@ class JsmContainerTest extends Specification {
         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 = JsmContainer.setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
+                DockerClientImpl dockerClient = setupSecureRemoteConnection(dockerRemoteHost, dockerCertPath)
                 assert dockerClient.ping().content as String == "OK": "Error pinging remote Docker engine"
                 return dockerClient
             } catch (ex) {
@@ -247,4 +280,21 @@ class JsmContainerTest extends Specification {
         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/deployment/impl/JsmH2DeploymentTest.groovy b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
new file mode 100644
index 0000000..94885e6
--- /dev/null
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -0,0 +1,123 @@
+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 JsmH2DeploymentTest extends Specification {
+
+    @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://localhost:8080"
+
+    @Shared
+    DockerClientImpl dockerClient
+
+    @Shared
+    static Logger log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)
+
+    @Shared
+    File projectRoot = new File(".")
+
+    def setupSpec() {
+
+
+        dockerClient = resolveDockerClient()
+        dockerClient.stop("JSM")
+        dockerClient.rm("JSM")
+    }
+
+    def "test setupDeployment"() {
+        setup:
+        JsmH2Deployment jsmDep = new JsmH2Deployment(jiraBaseUrl)
+        jsmDep.setupSecureDockerConnection(dockerRemoteHost, dockerCertPath)
+        //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,
+                "https://marketplace.atlassian.com/download/apps/6572/version/1311472"  : new File(projectRoot.path + "/resources/jira/licenses/tempoTimeSheets.license").text,
+                "https://marketplace.atlassian.com/download/apps/1211542/version/302030": ""
+        ]
+
+        when:
+        boolean setupSuccess = jsmDep.setupDeployment()
+        then:
+        setupSuccess
+
+        //cleanup:
+
+        //jsmDep.containers.each {it.stopAndRemoveContainer()}
+    }
+
+
+    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 8bf05d09b065b646761c53022d7936faa6378d3a Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 15 Jul 2022 11:52:05 +0200
Subject: [PATCH 2/4] Added basic jsm example script

---
 examples/Basic JSM Setup.groovy | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 examples/Basic JSM Setup.groovy

diff --git a/examples/Basic JSM Setup.groovy b/examples/Basic JSM Setup.groovy
new file mode 100644
index 0000000..c117501
--- /dev/null
+++ b/examples/Basic JSM Setup.groovy	
@@ -0,0 +1,7 @@
+import com.eficode.devstack.deployment.impl.JsmH2Deployment
+
+String jiraBaseUrl = "http://localhost:8080"
+JsmH2Deployment jsmDep = new JsmH2Deployment(jiraBaseUrl)
+File projectRoot = new File(".")
+jsmDep.setJiraLicense(new File(projectRoot.path + "/resources/jira/licenses/jsm.license"))
+jsmDep.setupDeployment()
\ No newline at end of file

From bb9332f84a5ceebc54f72ed1264e7c2b9cdb265c Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 15 Jul 2022 16:08:35 +0200
Subject: [PATCH 3/4] Added repo for JirInstanceManagerRest

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2f64672..074512c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
 
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>eficode-github-jiraManagerRest</id>
+            <url>https://github.com/eficode/JiraInstanceMangerRest/raw/pre_v1_tweaks/repository/</url>
+        </repository>
+    </repositories>
     <build>
         <plugins>
             <plugin>

From 4719f2610812c6a9c1430b49fcdab0559fc81fce Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Mon, 18 Jul 2022 14:34:14 +0200
Subject: [PATCH 4/4] Updated POM to generate sources

---
 pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 074512c..b76ef45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>jirainstancemanger</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
 
 
@@ -74,7 +74,22 @@
         </repository>
     </repositories>
     <build>
+        <sourceDirectory>${basedir}/src/main/groovy</sourceDirectory>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>