1.2.0 release (#6)

* Working on BitbucketContainer. Basic deployment now works

* Added runOnFirstStartup to containers
Started added network related methods to Container.groovy, testing in progress

* Started adding networking to Containers interface

* Minor bugfixes

* Updated to use the new JiraInstanceManager and bitbucketinstancemanager
Added Deployment for Bitbucket H2

* JsmAndBitbucketH2Deployment.groovy
 Now deploys JSM and Bitbucket in parallel
 Perhaps create a new interface superDeployment

* 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()

* 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

* Added networking to Deployments

* 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

* Configured more of the tests to us DevStackSpec

* Working on git actions

* Workflow fixes

* Minor tweaks

* Cleanup

* Bumped version to 1.1.0

* Fixed bug in workflow

* Minor fixes and tweaks

* Added dependency on JiraShortcuts
JsmContainer.groovy and JsmH2Deployment.groovy now dynamically sets container port based on base url

* BitbucketContainer.groovy and BitbucketH2Deployment.groovy now works with custom url and port

* Updated version to 1.2.0

* Updated github action workflow

* Working on BitbucketContainer. Basic deployment now works

* Added runOnFirstStartup to containers
Started added network related methods to Container.groovy, testing in progress

* Started adding networking to Containers interface

* Minor bugfixes

* Updated to use the new JiraInstanceManager and bitbucketinstancemanager
Added Deployment for Bitbucket H2

* JsmAndBitbucketH2Deployment.groovy
 Now deploys JSM and Bitbucket in parallel
 Perhaps create a new interface superDeployment

* 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()

* 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

* Added networking to Deployments

* 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

* Configured more of the tests to us DevStackSpec

* Working on git actions

* Workflow fixes

* Minor tweaks

* Cleanup

* Bumped version to 1.1.0

* Fixed bug in workflow

* Minor fixes and tweaks

* Added dependency on JiraShortcuts
JsmContainer.groovy and JsmH2Deployment.groovy now dynamically sets container port based on base url

* BitbucketContainer.groovy and BitbucketH2Deployment.groovy now works with custom url and port

* Updated version to 1.2.0

* Updated github action workflow

* Added jarRepositories.xml

* JsmAndBitbucketH2DeploymentTest.groovy added jiraAppsToInstall

Author: farthinder

.github/workflows/publish-maven-package.yml

@@ -21,31 +21,50 @@ jobs:
         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
+          cache: "maven"
 
       #Manually first (once) set up an orphaned branch:
       # git switch --orphan packages
       # git commit --allow-empty -m "Initial commit on packages branch"
       # git push origin packages:packages
 
-      - name: Install Package to packages branch
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Installing parent pom file
         run: |
-          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
+          mvn install:install-file -Dpackaing=pom -Dfile=pom.xml -DpomFile=pom.xml -DcreateChecksum=true
+
+      - name: Installing Groovy 2.5 Version
+        run: |
           
           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
+          mvn install -f pom-2.5.xml -DcreateChecksum=true
+
+      - name: Installing Groovy 3 Version
+        run: |
           
           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
-          
+          mvn install -f pom-3.0.xml  -DcreateChecksum=true
+
+
+      - name: Copying JAR files
+        run: |
           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
-          
+          rsync -avh --checksum ~/.m2/repository/com/eficode/devstack/ repository/com/eficode/devstack/
+
+      - name: Committing and pushing JAR files
+        run: |
           
           git config user.name github-actions
           git config user.email github-actions@github.com

.idea/jarRepositories.xml

@@ -6,14 +6,14 @@
 
     <name>DevStack for Groovy 2.5</name>
     <artifactId>devstack</artifactId>
-    <version>1.1.0-SNAPSHOT-groovy-2.5</version>
+    <version>1.2.0-SNAPSHOT-groovy-2.5</version>
     <packaging>jar</packaging>
 
 
     <parent>
         <groupId>com.eficode</groupId>
         <artifactId>devstack</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>pom.xml</relativePath>
     </parent>
 
@@ -32,6 +32,13 @@
         </dependency>
 
 
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>JiraShortcuts</artifactId>
+            <version>2.0-SNAPSHOT-groovy-2.5</version>
+        </dependency>
+
+
 
         <dependency>
             <groupId>com.eficode.atlassian</groupId>

pom-2.5.xml

@@ -6,14 +6,14 @@
 
     <name>DevStack for Groovy 3</name>
     <artifactId>devstack</artifactId>
-    <version>1.1.0-SNAPSHOT-groovy-3.0</version>
+    <version>1.2.0-SNAPSHOT-groovy-3.0</version>
     <packaging>jar</packaging>
 
 
     <parent>
         <groupId>com.eficode</groupId>
         <artifactId>devstack</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>pom.xml</relativePath>
     </parent>
 
@@ -31,12 +31,17 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.eficode.atlassian</groupId>
+            <artifactId>JiraShortcuts</artifactId>
+            <version>2.0-SNAPSHOT-groovy-3.0</version>
+        </dependency>
 
 
         <dependency>
             <groupId>com.eficode.atlassian</groupId>
             <artifactId>bitbucketinstancemanager</artifactId>
-            <version>0.0.3-SNAPSHOT-groovy-2.5</version>
+            <version>0.0.3-SNAPSHOT-groovy-3.0</version>
             <classifier>standalone</classifier>
         </dependency>
 

pom-3.0.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <name>DevStack - Parent pom</name>
 
@@ -54,6 +54,7 @@
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
+
         <dependency>
             <groupId>de.gesellix</groupId>
             <artifactId>docker-client</artifactId>
@@ -99,6 +100,10 @@
             <id>eficode-github-BitbucketInstanceManagerRest</id>
             <url>https://github.com/eficode/BitbucketInstanceManagerRest/raw/packages/repository/</url>
         </repository>
+        <repository>
+            <id>eficode-github-JiraShortcuts</id>
+            <url>https://github.com/eficode/JiraShortcuts/raw/packages/repository/</url>
+        </repository>
     </repositories>
 
     <build>

pom.xml

@@ -30,6 +30,8 @@ import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Duration
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 
 trait Container {
 
@@ -58,8 +60,6 @@ trait Container {
     }
 
 
-
-
     abstract String createContainer(ArrayList<String> cmd, ArrayList<String> entrypoint)
 
     abstract String createContainer()
@@ -126,7 +126,7 @@ trait Container {
         ArrayList<ContainerSummary> containers = dockerClient.ps().content
 
         ContainerSummary matchingContainer = containers.find { it.names.first() == "/" + self.containerName }
-        this.containerId = matchingContainer.id
+        this.containerId = matchingContainer?.id
         log.info("\tGot:" + this.containerId)
 
         return containerId
@@ -147,6 +147,7 @@ trait Container {
         }
 
         setContainerNetworks([network])
+
         dockerClient.startContainer(self.containerId)
 
 
@@ -192,13 +193,12 @@ trait Container {
         ContainerInspectResponse inspectResponse = inspectContainer()
         ArrayList<String> ips = inspectResponse.networkSettings.networks.values().ipAddress
 
-        if (inspectResponse.networkSettings.ipAddress != null ) {
+        if (inspectResponse.networkSettings.ipAddress != null) {
             ips.add(inspectResponse.networkSettings.ipAddress)
             ips.unique(true)
         }
 
 
-
         return ips
     }
 
@@ -233,7 +233,8 @@ trait Container {
             }
             return false
         } else {
-            return false
+            log.info("\tContainer not setup, nothing to remove")
+            return true
         }
 
 
@@ -417,12 +418,12 @@ trait Container {
         Map<String, EndpointSettings> rawResponse = inspectContainer().networkSettings.networks
 
         ArrayList<Network> networks = []
-        rawResponse.keySet().each {networkId ->
+        rawResponse.keySet().each { networkId ->
             Network network = getNetwork(networkId)
 
             if (network != null) {
                 networks.add(network)
-            }else if (networkId) {
+            } else if (networkId) {
                 //Handle networks that the container is attached to but that have been deleted
                 Network deletedNetwork = new Network()
                 deletedNetwork.id = networkId
@@ -437,7 +438,7 @@ trait Container {
     ArrayList<Network> getContainerBridgeNetworks() {
 
 
-        return getContainerNetworks().findAll {it.driver == "bridge"}
+        return getContainerNetworks().findAll { it.driver == "bridge" }
 
     }
 
@@ -448,7 +449,7 @@ trait Container {
      * @param network
      * @return true on success
      */
-    boolean connectContainerToNetwork(Network network) throws InputMismatchException{
+    boolean connectContainerToNetwork(Network network) throws InputMismatchException {
 
 
         log.info("Connecting container $containerId to network:" + network.name)
@@ -493,7 +494,7 @@ trait Container {
      * @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{
+    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")
@@ -508,7 +509,7 @@ trait Container {
         }
         log.info("\tFinished disconnecting container from unwanted networks, now connecting to new networks")
 
-        ArrayList<Network>connectedNetworks = containerNetworks
+        ArrayList<Network> connectedNetworks = containerNetworks
         newNetworks.each { wantedNetwork ->
 
             if (connectedNetworks.id.find { wantedNetwork.id }) {
@@ -591,6 +592,24 @@ trait Container {
     }
 
 
+    /**
+     * Gets the port from a URL
+     * @param url
+     * @return
+     */
+    String extractPortFromUrl(String url) {
+        Pattern pattern = Pattern.compile(".*?:(\\d+)")
+
+        Matcher matcher = pattern.matcher(url)
+        if (matcher.find() && matcher.groupCount() > 0) {
+            return matcher.group(1)
+        } else if (url.startsWith("https")) {
+            return "443"
+        } else {
+            return "80"
+        }
+
+    }
 
     String extractDomainFromUrl(String url) {
         String out = url.replaceFirst(/^https?:\/\//, "") //Remove protocol
@@ -600,5 +619,4 @@ trait Container {
     }
 
 
-
 }

src/main/groovy/com/eficode/devstack/container/Container.groovy

@@ -48,17 +48,17 @@ class BitbucketContainer implements Container{
 
     }
 
-    String createBbContainer(String containerName = this.containerName, String imageName = containerImage, String imageTag = containerImageTag, long maxRamMB = jvmMaxRam, String mainPort = containerMainPort) {
+    String createBbContainer(String containerName = this.containerName, String imageName = containerImage, String imageTag = containerImageTag, long maxRamMB = jvmMaxRam, String mainPort = containerMainPort, String baseUrl = this.containerName) {
 
         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.env = ["JVM_MAXIMUM_MEMORY=" + maxRamMB.toString() + "m", "JVM_MINIMUM_MEMORY=" + ((maxRamMB / 2) as String) + "m", "SETUP_BASEURL=" + baseUrl]
             c.exposedPorts = [(mainPort + "/tcp"): [:]]
-            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [(mainPort + "/tcp"): [new PortBinding("0.0.0.0", (mainPort.toString()))]] }
+            c.hostConfig = new HostConfig().tap { h -> h.portBindings = [("7990/tcp"): [new PortBinding("0.0.0.0", (mainPort.toString()))]] }
             c.hostname = containerName
 
         }
@@ -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 status: \$?", 20).any {it.contains("status: 0")}
+        assert runBashCommandInContainer("apt update; apt install -y htop nano inetutils-ping net-tools; echo status: \$?", 300).any {it.contains("status: 0")}
 
         return true
     }