Merge pull request #12 from xebialabs-community/quality

Quality

.gitignore

@@ -5,4 +5,5 @@
 .settings/
 bin/
 build
+src/test/resources/docker/initialize/cis.zip
 supervisord.*

CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+## [Unreleased]
+
+## v1.0.4
+
+### Fixed
+- fix: Create sub directory on windows if non existing
+
+### Improved
+- added xld docker containers 8.1.0
+
+

build.gradle

@@ -14,10 +14,10 @@ apply plugin: 'eclipse'
 apply plugin: 'maven'
 
 xlDocker {
-  compileImage = 'xebialabs/xld_dev_compile'
-  compileVersion = 'v7.1.0.3'
-  runImage = 'xebialabs/xld_dev_run'
-  runVersion = 'v7.1.0.1'
+  compileImage = 'xebialabsunsupported/xld_dev_compile'
+  compileVersion = '8.1.0'
+  runImage = 'xebialabsunsupported/xld_dev_run'
+  runVersion = '8.1.0'
   runPortMapping = '14516:4516'
 }
 
@@ -40,7 +40,7 @@ processResources.configure {
 
 license {
   header rootProject.file('License.md')
-  strictCheck false
+  strictCheck true
   ext.year = Calendar.getInstance().get(Calendar.YEAR)
   ext.name = 'XEBIALABS'
 }

src/test/resources/docker/docker-compose.yml

@@ -0,0 +1,25 @@
+#
+# Copyright 2018 XEBIALABS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+xld:
+  image: xebialabsunsupported/xld_dev_run:8.1.0
+  volumes:
+    - ~/xl-licenses/deployit-license.lic:/opt/xl-deploy-server/default-conf/deployit-license.lic
+    - ./../../../../:/data
+  ports:
+   - "14516:4516"
+
+xld_cli:
+  image: xebialabsunsupported/xl-docker-demo-xld-cli:8.1.0
+  volumes:
+    - ./initialize:/data
+  links:
+    - xld
+

src/test/resources/docker/initialize/cis/configuration-items.xml

@@ -74,7 +74,7 @@
       <scanPlaceholders>false</scanPlaceholders>
       <placeholders />
       <checksum>70e36ac48f0f8e20ebf419e1969927abef4762ef</checksum>
-      <fileUri>jcr:example.zip</fileUri>
+      <fileUri>internal:example.zip</fileUri>
       <targetPath>{{TARGET_FOLDER}}</targetPath>
       <targetPathShared>true</targetPathShared>
     </xld.Folder>

src/test/resources/docker/initialize/xld_initialize.py

@@ -43,5 +43,6 @@ def add_folder(zos, folder_name, base_folder_name):
     input_stream.close()
     zos.closeEntry()
 
-result = zipdir("/data/build/resources/test/docker/initialize/cis", "/tmp/cis.zip")
-repository.importCisAndWait("/tmp/cis.zip")
+result = zipdir("/data/cis", "/data/cis.zip")
+print result
+repository.importCisAndWait("/data/src/test/resources/docker/initialize/cis.zip")