From 703ebf891541e426c4c40fbc839ecb0e017a9318 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Tue, 23 May 2023 12:36:58 +0200
Subject: [PATCH 1/6] pom.xml  Bumped to 2.3.2  Bumped DockerClient to
 2023-05-07T23-22-00

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae7367e..34abd11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>de.gesellix</groupId>
             <artifactId>docker-client</artifactId>
-            <version>2022-07-28T22-55-00</version>
+            <version>2023-05-07T23-22-00</version>
         </dependency>
 
         <!--dependency>

From f8a7e9d17da6c9e8d64d6398cb71dcd744920534 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Fri, 25 Aug 2023 10:33:59 +0200
Subject: [PATCH 2/6] pom.xml  * Bumped to 2.3.3 JsmContainer.groovy  * Added
 enableJvmDebug()

---
 pom.xml                                       |  2 +-
 .../container/impl/JsmContainer.groovy        | 36 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34abd11..16c55c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.2-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
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 12f3682..893c248 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy
@@ -22,12 +22,23 @@ class JsmContainer implements Container {
     String containerImageTag = "latest"
     long jvmMaxRam = 6000
 
+    private String debugPort //Contains the port used for JVM debug
+
     JsmContainer(String dockerHost = "", String dockerCertPath = "") {
         if (dockerHost && dockerCertPath) {
             assert setupSecureRemoteConnection(dockerHost, dockerCertPath): "Error setting up secure remote docker connection"
         }
     }
 
+    /**
+     * Enables JVM debug of JIRA for port portNr
+     * @param portNr
+     */
+    void enableJvmDebug(String portNr = "5005") {
+
+        assert !created: "Error, cant enable JVM Debug for a container that has already been crated"
+        debugPort = portNr
+    }
 
     /**
      * Gets the latest version number from Atlassian Marketplace
@@ -38,9 +49,9 @@ class JsmContainer implements Container {
         UnirestInstance unirest = Unirest.spawnInstance()
 
         HttpResponse<JsonResponse> response = unirest.get("https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest").asJson() as HttpResponse<JsonResponse>
-        assert response.success : "Error getting latest JSM version from marketplace"
+        assert response.success: "Error getting latest JSM version from marketplace"
         String version = response?.body?.object?.get("name")
-        assert version : "Error parsing latest JSM version from marketplace response"
+        assert version: "Error parsing latest JSM version from marketplace response"
 
         unirest.shutDown()
 
@@ -50,7 +61,7 @@ class JsmContainer implements Container {
     @Override
     ContainerCreateRequest setupContainerCreateRequest() {
 
-       String image = containerImage + ":" + containerImageTag
+        String image = containerImage + ":" + containerImageTag
 
         log.debug("Setting up container create request for JSM container")
         if (dockerClient.engineArch != "x86_64") {
@@ -72,13 +83,24 @@ class JsmContainer implements Container {
         ContainerCreateRequest containerCreateRequest = new ContainerCreateRequest().tap { c ->
 
             c.image = image
+            c.hostname = containerName
+            c.env = ["JVM_MAXIMUM_MEMORY=" + jvmMaxRam + "m", "JVM_MINIMUM_MEMORY=" + ((jvmMaxRam / 2) as String) + "m", "ATL_TOMCAT_PORT=" + containerMainPort] + customEnvVar
+
+
             c.exposedPorts = [(containerMainPort + "/tcp"): [:]]
             c.hostConfig = new HostConfig().tap { h ->
                 h.portBindings = [(containerMainPort + "/tcp"): [new PortBinding("0.0.0.0", (containerMainPort))]]
+
+                if (debugPort) {
+                    h.portBindings.put((debugPort + "/tcp"), [new PortBinding("0.0.0.0", (debugPort))])
+                    c.exposedPorts.put((debugPort + "/tcp"), [:])
+                    c.env.add("JVM_SUPPORT_RECOMMENDED_ARGS=-Xdebug -Xrunjdwp:transport=dt_socket,address=*:${debugPort},server=y,suspend=n".toString())
+                }
+
+
                 h.mounts = this.mounts
             }
-            c.hostname = containerName
-            c.env = ["JVM_MAXIMUM_MEMORY=" + jvmMaxRam + "m", "JVM_MINIMUM_MEMORY=" + ((jvmMaxRam / 2) as String) + "m", "ATL_TOMCAT_PORT=" + containerMainPort] + customEnvVar
+
 
 
         }
@@ -88,10 +110,6 @@ class JsmContainer implements Container {
     }
 
 
-
-
-
-
     boolean runOnFirstStartup() {
 
         ArrayList<String> initialOut = runBashCommandInContainer("echo END")

From aec35eaf7b3acce410e2826b2004aea0b4168ea2 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Tue, 12 Sep 2023 18:30:26 +0200
Subject: [PATCH 3/6] AlpineContainer.groovy  * Moved the runCmdAndRm() and
 runCmdAndRm() to the interface class Container

Container.groovy
 * added customizeContainerCreateRequest() that allows implementing methods to easily override parts of the ContainerCreateRequest
 * added runCmdAndRm()

TimeMachine.groovy
 * A new helper method for traveling in time!
pom.xml
 * Bumped to 2.3.4
---
 pom.xml                                       |   2 +-
 .../devstack/container/Container.groovy       | 135 +++++++++++++++++-
 .../container/impl/AlpineContainer.groovy     | 102 -------------
 .../eficode/devstack/util/TimeMachine.groovy  | 109 ++++++++++++++
 4 files changed, 240 insertions(+), 108 deletions(-)
 create mode 100644 src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy

diff --git a/pom.xml b/pom.xml
index 16c55c7..67b0137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.3-SNAPSHOT</version>
+    <version>2.3.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
diff --git a/src/main/groovy/com/eficode/devstack/container/Container.groovy b/src/main/groovy/com/eficode/devstack/container/Container.groovy
index 9772dd4..51ac96f 100644
--- a/src/main/groovy/com/eficode/devstack/container/Container.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/Container.groovy
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Duration
+import java.util.concurrent.TimeoutException
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -91,8 +92,17 @@ trait Container {
 
         }
 
-        return containerCreateRequest
+        return customizeContainerCreateRequest(containerCreateRequest)
+
+    }
 
+    /**
+     * Helper method that allows you to easily customize the ContainerCreateRequest by overriding just this method
+     * @param containerCreateRequest
+     * @return
+     */
+    ContainerCreateRequest customizeContainerCreateRequest(ContainerCreateRequest containerCreateRequest) {
+        return containerCreateRequest
     }
 
     /**
@@ -108,7 +118,7 @@ trait Container {
         ContainerCreateRequest containerCreateRequest = setupContainerCreateRequest()
 
         if (cmd.size()) {
-            containerCreateRequest.cmd = cmd
+            containerCreateRequest.cmd = cmd.collect {it.toString()}
         }
 
         if (entrypoint.size()) {
@@ -180,7 +190,7 @@ trait Container {
         return containerId
     }
 
-    def getSelf() {
+    Container getSelf() {
         return this
     }
 
@@ -625,7 +635,7 @@ trait Container {
     }
 
     /**
-     * Copy files from a container
+     * Copy files from a container to local machine
      * @param containerPath can be a file or a path (ending in /)
      * @param destinationPath
      * @return
@@ -712,6 +722,121 @@ trait Container {
         return runCommandInContainer(self.containerId, [self.defaultShell, "-c", command], timeoutS, user)
 
 
+    }
+
+    /**
+     * Creates an temporary container, runs a command, exits and removes container
+     * @param cmd A string that will be passed as a command to /bin/sh -c, ex: echo start;sleep 5
+     * @param timeoutMs
+     *      0 don't wait, return an array with the container ID immediately,
+     *      timeoutMs > 0 Wait for container to stop, if it takes longer than timeoutMs an exception will be thrown
+     * @param mounts bind mounts that the container should have:
+     *      readOnly is optional and defaults to true
+     *      ex:[[src: "/tmp/engine/test", target: "/tmp/container/test", readOnly :true]
+     * @param dockerHost
+     * @param dockerCertPath
+     * @return An array of the container logs, or just an array containing container id if timeoutMs == 0
+     */
+    static ArrayList<String> runCmdAndRm(String cmd, long timeoutMs, ArrayList<Map> mounts = [], String dockerHost = "", String dockerCertPath = "") {
+
+
+        return runCmdAndRm(["/bin/sh", "-c", cmd], timeoutMs, mounts, dockerHost, dockerCertPath)
+    }
+
+
+
+    /**
+     * Creates a temporary container, runs a command, exits and removes container
+     * @param container a container object that hasnt yet been created
+     * @param cmd An array of commands to run, ex: [ "/bin/sh", "-c", "echo start;sleep 5"]
+     * @param timeoutMs
+     *      0 don't wait, return an array with the container ID immediately,
+     *      timeoutMs > 0 Wait for container to stop, if it takes longer than timeoutMs an exception will be thrown
+     * @param mounts bind mounts that the container should have:
+     *      readOnly is optional and defaults to true
+     *      ex:[[src: "/tmp/engine/test", target: "/tmp/container/test", readOnly :true]
+     * @param dockerHost
+     * @param dockerCertPath
+     * @return An array of the container logs, or just an array containing container id if timeoutMs == 0
+     */
+    static ArrayList<String> runCmdAndRm( ArrayList<String> cmd, long timeoutMs, ArrayList<Map> mounts = [], String dockerHost = "", String dockerCertPath = "") {
+
+
+        Container container = this.getConstructor(String, String).newInstance(dockerHost, dockerCertPath)
+
+        Logger log = LoggerFactory.getLogger(this.class)
+
+
+
+        log.info("Creating a $container.class.simpleName and running:")
+        log.info("\tCmd:" + cmd)
+
+
+
+        try {
+
+            container.containerName = container.containerName + "-cmd-" + System.currentTimeMillis().toString()[-5..-1]
+
+            mounts.each {
+                log.info("\tPreparing Bind mount:")
+                container.prepareBindMount(it.src as String, it.target as String, it.containsKey("readOnly") ? it.readOnly as Boolean : true)
+            }
+
+
+            container.createContainer(cmd)
+            log.info("\tCreated container: " + container.id)
+
+
+            log.info("\tStarted container: " + container.startContainer())
+            assert !container.hasNeverBeenStarted(): "Error starting CMD container"
+
+            if (timeoutMs == 0) {
+                log.info("\tNo Timeout set, returning container id")
+                return [container.id]
+            }
+
+            long start = System.currentTimeMillis()
+
+            while (start + timeoutMs > System.currentTimeMillis() && container.running) {
+
+                log.info("\tWaited ${System.currentTimeMillis() - start}ms for container to stop")
+                sleep(1000)
+
+            }
+            log.info("\tContainer finisehd or timed out after ${System.currentTimeMillis() - start}ms")
+
+            if (container.running) {
+                log.info("\t"*2 + "Stopping container forcefully.")
+                ArrayList<String> containerOut = container.containerLogs
+                assert container.stopAndRemoveContainer(1): "Error stopping and removing CMD container after it timed out"
+
+                throw new TimeoutException("CMD container timed out, was forcefully stopped and removed. Container logs:" + containerOut?.join("\n"))
+            }
+
+
+
+            ArrayList<String> containerOut = container.containerLogs
+
+            log.info("\tReturning ${containerOut.size()} log lines")
+
+            assert container.stopAndRemoveContainer(): "Error removing Container:" + container.id
+            log.info("\tRemoved container:" + container.id)
+
+            return containerOut
+        } catch (ex) {
+
+
+            try {
+                container.stopAndRemoveContainer(1)
+            } catch (ignored){}
+
+
+
+            throw ex
+
+        }
+
+
     }
 
 
@@ -747,7 +872,7 @@ trait Container {
      */
     void prepareCustomEnvVar(ArrayList<String> keyVar) {
 
-        assert hasNeverBeenStarted(): "Error, cant set custom enviromental variables after creating container"
+        assert hasNeverBeenStarted(): "Error, cant set custom environment variables after creating container"
 
         self.customEnvVar = keyVar
     }
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 d1b4f37..72db03a 100644
--- a/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
+++ b/src/main/groovy/com/eficode/devstack/container/impl/AlpineContainer.groovy
@@ -34,110 +34,8 @@ class AlpineContainer implements Container {
     }
 
 
-    /**
-     * Creates an Alpine container, runs a command, exits and removes container
-     * @param cmd A string that will be passed as a command to /bin/sh -c, ex: echo start;sleep 5
-     * @param timeoutMs
-     *      0 don't wait, return an array with the container ID immediately,
-     *      timeoutMs > 0 Wait for container to stop, if it takes longer than timeoutMs an exception will be thrown
-     * @param mounts bind mounts that the container should have:
-     *      readOnly is optional and defaults to true
-     *      ex:[[src: "/tmp/engine/test", target: "/tmp/container/test", readOnly :true]
-     * @param dockerHost
-     * @param dockerCertPath
-     * @return An array of the container logs, or just an array containing container id if timeoutMs == 0
-     */
-    static ArrayList<String> runCmdAndRm(String cmd, long timeoutMs, ArrayList<Map> mounts = [:], String dockerHost = "", String dockerCertPath = "") {
-        return runCmdAndRm(["/bin/sh", "-c", cmd], timeoutMs, mounts, dockerHost, dockerCertPath)
-    }
-
-    /**
-     * Creates an Alpine container, runs a command, exits and removes container
-     * @param cmd An array of commands to run, ex: [ "/bin/sh", "-c", "echo start;sleep 5"]
-     * @param timeoutMs
-     *      0 don't wait, return an array with the container ID immediately,
-     *      timeoutMs > 0 Wait for container to stop, if it takes longer than timeoutMs an exception will be thrown
-     * @param mounts bind mounts that the container should have:
-     *      readOnly is optional and defaults to true
-     *      ex:[[src: "/tmp/engine/test", target: "/tmp/container/test", readOnly :true]
-     * @param dockerHost
-     * @param dockerCertPath
-     * @return An array of the container logs, or just an array containing container id if timeoutMs == 0
-     */
-    static ArrayList<String> runCmdAndRm(ArrayList<String> cmd, long timeoutMs, ArrayList<Map> mounts = [:], String dockerHost = "", String dockerCertPath = "") {
-
-        Logger log = LoggerFactory.getLogger(AlpineContainer)
-
-        log.info("Running alpine command")
-        log.info("\tCmd:" + cmd)
-        AlpineContainer container = null
-
-
-        try {
-            container = new AlpineContainer(dockerHost, dockerCertPath)
-            container.containerName = container.containerName + "-cmd-" + System.currentTimeMillis().toString()[-5..-1]
-
-            mounts.each {
-                log.info("\tPreparing Bind mount:")
-                container.prepareBindMount(it.src as String, it.target as String, it.containsKey("readOnly") ? it.readOnly as Boolean : true)
-            }
-
-
-            container.createContainer(cmd)
-            log.info("\tCreated container: " + container.id)
-
-
-            log.info("\tStarted container: " + container.startContainer())
-            assert !container.hasNeverBeenStarted(): "Error starting Alpine container"
-
-            if (timeoutMs == 0) {
-                log.info("\tNo Timeout set, returning container id")
-                return [container.id]
-            }
-
-            long start = System.currentTimeMillis()
-
-            while (start + timeoutMs > System.currentTimeMillis() && container.running) {
 
-                log.info("\tWaited ${System.currentTimeMillis() - start}ms for container to stop")
-                sleep(1000)
 
-            }
-            log.info("\tContainer finisehd or timed out after ${System.currentTimeMillis() - start}ms")
-
-            if (container.running) {
-                log.info("\t"*2 + "Stopping container forcefully.")
-                ArrayList<String> containerOut = container.containerLogs
-                assert container.stopAndRemoveContainer(1): "Error stopping and removing Alpine container after it timed out"
-
-                throw new TimeoutException("Alpine container timed out, was forcefully stopped and removed. Container logs:" + containerOut?.join("\n"))
-            }
-
-
-
-            ArrayList<String> containerOut = container.containerLogs
-
-            log.info("\tReturning ${containerOut.size()} log lines")
-
-            assert container.stopAndRemoveContainer(): "Error removing Container:" + container.id
-            log.info("\tRemoved container:" + container.id)
-
-            return containerOut
-        } catch (ex) {
-
-
-            try {
-                container.stopAndRemoveContainer(1)
-            } catch (ignored){}
-
-
-
-            throw ex
-
-        }
-
-
-    }
 
 
 }
diff --git a/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy b/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy
new file mode 100644
index 0000000..e997df0
--- /dev/null
+++ b/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy
@@ -0,0 +1,109 @@
+package com.eficode.devstack.util
+
+import com.eficode.devstack.container.Container
+import de.gesellix.docker.remote.api.ContainerCreateRequest
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import java.time.Duration
+import java.time.Instant
+import java.time.temporal.TemporalAdjuster
+
+/**
+ * <b>WARNING THIS AFFECTS ALL CONTAINERS</b>
+ * <p>
+ * This utility class is intended to change the "current time" as experienced by Docker Containers.
+ * It has only been tested on, and will likely only work in the official "MacOS Docker Desktop" app.
+ * <p>
+ * The class essentially performs privilege escalation exploit to run root privileged commands on the docker engine,
+ * <p>
+ * <b>NEVER EVER</b> use this class on a production docker engine
+ * <p>
+ * <b>NOTE</b> all containers sharing a Docker Engine also share the date/time, be aware that when changing time
+ * you change it for all running containers
+ *
+ */
+class TimeMachine implements Container{
+
+    String containerName = "TimeMachine"
+    String containerMainPort = null
+    String containerImage = "alpine"
+    String containerImageTag = "latest"
+    String defaultShell = "/bin/sh"
+
+
+
+    /**
+     * Travel back to the present
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean travelToNow(String dockerHost = "", String dockerCertPath = "") {
+        return setTime(System.currentTimeSeconds(), dockerHost, dockerCertPath)
+    }
+
+    /**
+     * Travel X days in time
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param days Number of days to travel, can be negative (to the past) or positive (to the future)
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean travelDays(int days, String dockerHost = "", String dockerCertPath = "") {
+
+        long newEpochS = System.currentTimeSeconds() +  Duration.ofDays(days).toSeconds()
+
+        return setTime(newEpochS, dockerHost, dockerCertPath)
+
+    }
+
+
+    /**
+     * Change docker engine time <p>
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param epochS The new epoch in seconds to be used
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean setTime(long epochS, String dockerHost = "", String dockerCertPath = "") {
+
+        Logger log = LoggerFactory.getLogger(this.class)
+        log.info("Setting global docker time to:" + epochS)
+        log.warn("THIS WILL AFFECT ALL CONTAINERS RUN BY THIS DOCKER ENGINE")
+
+
+        assert epochS <= 9999999999 && epochS > 1000000000 : "Provide timestamp in epoch seconds"
+        ArrayList<String> cmdOut = runCmdAndRm(["nsenter" ,"-t" ,"1" ,"-m" ,"-u" ,"-n", "-i", "sh", "-c", "pkill sntpc || date -s \"@${epochS}\" && echo Status \$?"], 5000, [] , dockerHost, dockerCertPath)
+        assert cmdOut.toString().contains("Status 0") : "Error setting time"
+
+        cmdOut = runCmdAndRm('date +"%s"', 5000, [], dockerHost, dockerCertPath )
+
+
+        long newTime = cmdOut.find {it.isNumber()}?.toLong() ?: 0
+        assert newTime : "Unexpected output when verifying time was change"
+        assert newTime >= epochS : "The newly set time appears incorrect: " + newTime
+
+        return true
+
+    }
+
+
+
+    @Override
+    ContainerCreateRequest customizeContainerCreateRequest(ContainerCreateRequest containerCreateRequest){
+
+
+        containerCreateRequest.hostConfig.setPrivileged(true)
+        containerCreateRequest.hostConfig.setPidMode("host".toString())
+
+        return containerCreateRequest
+
+    }
+}

From 8d2643a8b9832bcef6c337a716d4eda30c2cc0d4 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Wed, 13 Sep 2023 10:03:49 +0200
Subject: [PATCH 4/6] TimeMachine.groovy  * Added several helper set methods
 for different time/date classes pom.xml  * Bumped to 2.3.5

---
 pom.xml                                       |   2 +-
 .../eficode/devstack/util/TimeMachine.groovy  | 101 +++++++++++++++---
 2 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67b0137..e648db3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.4-SNAPSHOT</version>
+    <version>2.3.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
diff --git a/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy b/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy
index e997df0..e5ac220 100644
--- a/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy
+++ b/src/main/groovy/com/eficode/devstack/util/TimeMachine.groovy
@@ -7,6 +7,9 @@ import org.slf4j.LoggerFactory
 
 import java.time.Duration
 import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneId
 import java.time.temporal.TemporalAdjuster
 
 /**
@@ -23,7 +26,7 @@ import java.time.temporal.TemporalAdjuster
  * you change it for all running containers
  *
  */
-class TimeMachine implements Container{
+class TimeMachine implements Container {
 
     String containerName = "TimeMachine"
     String containerMainPort = null
@@ -32,7 +35,6 @@ class TimeMachine implements Container{
     String defaultShell = "/bin/sh"
 
 
-
     /**
      * Travel back to the present
      * <b>NEVER EVER</b> use this class on a production docker engine <p>
@@ -42,11 +44,12 @@ class TimeMachine implements Container{
      * @return true after verifying success
      */
     static boolean travelToNow(String dockerHost = "", String dockerCertPath = "") {
+
         return setTime(System.currentTimeSeconds(), dockerHost, dockerCertPath)
     }
 
     /**
-     * Travel X days in time
+     * Travel X days in time from actual "Now"
      * <b>NEVER EVER</b> use this class on a production docker engine <p>
      * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
      * @param days Number of days to travel, can be negative (to the past) or positive (to the future)
@@ -56,12 +59,72 @@ class TimeMachine implements Container{
      */
     static boolean travelDays(int days, String dockerHost = "", String dockerCertPath = "") {
 
-        long newEpochS = System.currentTimeSeconds() +  Duration.ofDays(days).toSeconds()
+        long newEpochS = System.currentTimeSeconds() + Duration.ofDays(days).toSeconds()
 
         return setTime(newEpochS, dockerHost, dockerCertPath)
 
     }
 
+    /**
+     * Travel X days in time relative to
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param days Number of days to travel, can be negative (to the past) or positive (to the future)
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean travelRelativeDays(int days, String dockerHost = "", String dockerCertPath = "") {
+
+        long currentDockerTime = getDockerTime(dockerHost, dockerCertPath)
+
+        long newEpochS = currentDockerTime + Duration.ofDays(days).toSeconds()
+
+        return setTime(newEpochS, dockerHost, dockerCertPath)
+
+    }
+
+    /**
+     * Set new time based on Date object
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param date A date object to use as the new "now"
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean setDate(Date date, String dockerHost = "", String dockerCertPath = "") {
+        return setTime(((date.toInstant().toEpochMilli()) / 1000).toInteger(), dockerHost, dockerCertPath)
+    }
+
+    /**
+     * Set new time based on LocalDateTime object, uses the system default Time Zone
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param localDateTime A LocalDateTime object to use as the new "now"
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean setLocalDateTime(LocalDateTime localDateTime, String dockerHost = "", String dockerCertPath = "") {
+
+        return setTime(localDateTime.toEpochSecond(ZoneId.systemDefault().offset), dockerHost, dockerCertPath)
+    }
+
+    /**
+     * Set new time based on LocalDate object
+     * <b>NEVER EVER</b> use this class on a production docker engine <p>
+     * <b>WARNING THIS AFFECTS ALL CONTAINERS - READ CLASS DOCUMENTATION</b>
+     * @param LocalDate A LocalDate object to use as the new "now"
+     * @param dockerHost optional
+     * @param dockerCertPath optional
+     * @return true after verifying success
+     */
+    static boolean setLocalDate(LocalDate localDate, String dockerHost = "", String dockerCertPath = "") {
+
+        return setTime(localDate.toEpochDay(), dockerHost, dockerCertPath)
+    }
+
 
     /**
      * Change docker engine time <p>
@@ -79,25 +142,37 @@ class TimeMachine implements Container{
         log.warn("THIS WILL AFFECT ALL CONTAINERS RUN BY THIS DOCKER ENGINE")
 
 
-        assert epochS <= 9999999999 && epochS > 1000000000 : "Provide timestamp in epoch seconds"
-        ArrayList<String> cmdOut = runCmdAndRm(["nsenter" ,"-t" ,"1" ,"-m" ,"-u" ,"-n", "-i", "sh", "-c", "pkill sntpc || date -s \"@${epochS}\" && echo Status \$?"], 5000, [] , dockerHost, dockerCertPath)
-        assert cmdOut.toString().contains("Status 0") : "Error setting time"
-
-        cmdOut = runCmdAndRm('date +"%s"', 5000, [], dockerHost, dockerCertPath )
+        assert epochS <= 9999999999 && epochS > 1000000000: "Provide timestamp in epoch seconds"
+        ArrayList<String> cmdOut = runCmdAndRm(["nsenter", "-t", "1", "-m", "-u", "-n", "-i", "sh", "-c", "pkill sntpc || date -s \"@${epochS}\" && echo Status \$?"], 5000, [], dockerHost, dockerCertPath)
+        assert cmdOut.toString().contains("Status 0"): "Error setting time"
 
+        long newTime = getDockerTime(dockerHost, dockerCertPath)
 
-        long newTime = cmdOut.find {it.isNumber()}?.toLong() ?: 0
-        assert newTime : "Unexpected output when verifying time was change"
-        assert newTime >= epochS : "The newly set time appears incorrect: " + newTime
+        assert newTime >= epochS: "The newly set time appears incorrect: " + newTime
 
         return true
 
     }
 
+    /**
+     * Get current time as reported by a docker container
+     * @param dockerHost
+     * @param dockerCertPath
+     * @return Epoch Seconds
+     */
+    static long getDockerTime(String dockerHost = "", String dockerCertPath = "") {
+
+        ArrayList<String> cmdOut = runCmdAndRm('date +"%s"', 5000, [], dockerHost, dockerCertPath)
+        long timeStamp = cmdOut.find { it.isNumber() }?.toLong() ?: 0
+        assert timeStamp: "Unexpected output when getting docker time"
+
+        return timeStamp
+
+    }
 
 
     @Override
-    ContainerCreateRequest customizeContainerCreateRequest(ContainerCreateRequest containerCreateRequest){
+    ContainerCreateRequest customizeContainerCreateRequest(ContainerCreateRequest containerCreateRequest) {
 
 
         containerCreateRequest.hostConfig.setPrivileged(true)

From 7ffa4c0954ca37cb51ca145b3682f1127792a9d8 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Tue, 19 Sep 2023 11:58:09 +0200
Subject: [PATCH 5/6] pom.xml  * Bumped to 2.3.6  * Bumped jirainstancemanager
 to 2.0.0

---
 pom.xml                                                       | 4 ++--
 .../devstack/deployment/impl/JsmH2DeploymentTest.groovy       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e648db3..3d2f05b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.5-SNAPSHOT</version>
+    <version>2.3.6-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>jirainstancemanager</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
 
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 9014886..a72655e 100644
--- a/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
+++ b/src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
@@ -36,7 +36,7 @@ class JsmH2DeploymentTest extends DevStackSpec {
         JsmH2Deployment jsmDep = new JsmH2Deployment(baseurl, dockerHost, certPath)
 
 
-        jsmDep.setJiraLicense(new File(projectRoot.path + "/resources/jira/licenses/jsm.license"))
+        jsmDep.setJiraLicense(new File(System.getProperty("user.home") + "/.licenses/jira/jsm.license").text)
         jsmDep.appsToInstall = [
                 "https://marketplace.atlassian.com/download/apps/1211542/version/302030": ""
         ]

From d2c4c21d836fa4fc0e0226f1639df508b7a85b82 Mon Sep 17 00:00:00 2001
From: Anders Lantz <lantzanders@gmail.com>
Date: Tue, 19 Sep 2023 13:49:39 +0200
Subject: [PATCH 6/6] pom.xml  * Bumped to 2.3.7  * Bumped JIM to 2.0.1
 JsmH2Deployment.groovy  * Now setups basic user preferences on setup

---
 pom.xml                                                     | 4 ++--
 .../eficode/devstack/deployment/impl/JsmH2Deployment.groovy | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d2f05b..24677d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.6-SNAPSHOT</version>
+    <version>2.3.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>jirainstancemanager</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.1-SNAPSHOT</version>
         </dependency>
 
 
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 bb1da0e..df2c85e 100644
--- a/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
+++ b/src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy
@@ -115,6 +115,12 @@ class JsmH2Deployment implements Deployment{
         assert jiraRest.setApplicationProperties(jiraLicense, "JIRA", jiraBaseUrl)
         log.info("\t\tLicense and properties setup successfully")
 
+        if (jiraRest.setupUserBasicPref()) {
+            log.info("\tSetup defaults for user ${jiraRest.adminUsername} and removed pop-ups")
+        }else {
+            log.warn("\tThere was a problem setting defaults for user ${jiraRest.adminUsername} and removing pop-ups")
+        }
+
        if(appsToInstall) {
            installApps()
        }