Merge "Added aptly docker image build job"
diff --git a/jenkins/client/job/docker/aptly.yml b/jenkins/client/job/docker/aptly.yml
new file mode 100644
index 0000000..eefbb86
--- /dev/null
+++ b/jenkins/client/job/docker/aptly.yml
@@ -0,0 +1,51 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        docker-build-images-aptly:
+          name: docker-build-images-aptly
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/docker-aptly"
+            credentials: "gerrit"
+          trigger:
+            gerrit:
+              project:
+                "mk/docker-aptly":
+                  branches:
+                    - master
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeTrivialRebase: false
+                      excludeNoCodeChange: false
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: '(recheck|reverify)'
+          param:
+            IMAGE_GIT_URL:
+              type: string
+              default: "${_param:jenkins_gerrit_url}/mk/docker-aptly"
+            IMAGE_BRANCH:
+              type: string
+              default: "master"
+            IMAGE_CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            IMAGE_TAGS:
+              type: string
+              default: "latest"
+            REGISTRY_URL:
+              type: string
+              default: ""
+            REGISTRY_CREDENTIALS_ID:
+              type: string
+              default: "dockerhub"
diff --git a/jenkins/client/job/docker.yml b/jenkins/client/job/docker/init.yml
similarity index 98%
rename from jenkins/client/job/docker.yml
rename to jenkins/client/job/docker/init.yml
index bf3fa8b..6a5cb43 100644
--- a/jenkins/client/job/docker.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -43,7 +43,7 @@
                 project:
                   "mk/docker-{{name}}":
                     branches:
-                      - master
+                      - {{branch}}
                 event:
                   patchset:
                     - created: