Merge pull request #555 from rawmind0/master

Upgrade artifactory version to 5.4.5. Added OSS or PRO version deploy…

templates/artifactory-oss/0/README.md

@@ -0,0 +1,30 @@
+# Artifactory 
+	
+[Artifactory][artifactory] is a universal Binary Repository Manager for use by build tools (like Maven and Gradle), 
+dependency management tools (like Ivy and NuGet) and build servers (like Jenkins, Hudson, TeamCity and Bamboo).
+ 
+Repository managers serve two purposes: they act as highly configurable proxies between your organization and 
+external repositories and they also provide build servers with a deployment destination for your internally 
+generated artifacts.
+
+### Usage:
+
+ Select Artifactory from catalog. 
+ 
+ - Select artifactory version, OSS or PRO.
+ - Set the params.
+
+ Click deploy.
+
+Note: To use the PRO version, you need to get a free trial.
+
+
+### More info:
+
+- [Resources][artifactory-resources]
+- [Free-trial][artifactory-trial]
+
+
+[artifactory]: https://www.jfrog.com/artifactory/
+[artifactory-resources]: https://www.jfrog.com/support-service/resources/
+[artifactory-trial]: https://www.jfrog.com/artifactory/free-trial/

templates/artifactory-oss/0/docker-compose.yml.tpl

@@ -1,21 +1,21 @@
 version: '2'
-
 services:
-
   artifactory:
-    image: docker.bintray.io/jfrog/artifactory-oss:5.4.4
+    {{- if eq .Values.ARTIFACTORY_VERSION "OSS"}}
-    {{- if (.Values.PUBLISH_PORT)}}
+    image: docker.bintray.io/jfrog/artifactory-oss:5.4.5
-    ports:
-      - ${PUBLISH_PORT}:8081
     {{- else}}
-    expose:
+    image: docker.bintray.io/jfrog/artifactory-pro:5.4.5
-      - 8081
     {{- end}}
     volumes:
      - artifactory-data:/var/opt/jfrog/artifactory
     environment:
      - EXTRA_JAVA_OPTIONS=${EXTRA_JAVA_OPTIONS}
-
+  {{- if (.Values.PUBLISH_PORT)}}
+  artifactory-lb:
+    image: rancher/lb-service-haproxy:v0.6.4
+    ports:
+      - ${PUBLISH_PORT}:${PUBLISH_PORT}
+  {{- end}}
 volumes:
   artifactory-data:
     driver: ${VOLUME_DRIVER}

templates/artifactory-oss/0/rancher-compose.yml

@@ -1,17 +1,26 @@
 version: '2'
-
 catalog:
-  name: "Artifactory OSS"
+  name: "Artifactory"
-  version: "5.4.4"
+  version: "5.4.5"
   description: "Artifactory is a universal Binary Repository Manager"
   questions:
+    - variable: "ARTIFACTORY_VERSION"
+      label: "Version"
+      description: |
+        Select the Artifactory server version. OSS or PRO
+      required: true
+      default: "OSS"
+      type: enum
+      options:
+        - OSS
+        - PRO
     - variable: "PUBLISH_PORT"
       label: "Publish port"
       description: |
         Set port if you want publish external port for Artifactory server.
-      required: false
+      required: true
-      type: "string"
+      type: "int"
-      default: "8081"
+      default: 8081
     - variable: "EXTRA_JAVA_OPTIONS"
       label: "Extra Java options"
       description: |
@@ -24,3 +33,28 @@ catalog:
         Specifiy docker volume driver to use
       default: "local"
       required: true
+services:
+  artifactory-lb:
+    scale: 1
+    lb_config:
+      certs: []
+      port_rules:
+      - protocol: http
+        service: artifactory
+        source_port: ${PUBLISH_PORT}
+        target_port: 8081
+    health_check:
+      response_timeout: 2000
+      healthy_threshold: 2
+      port: 42
+      unhealthy_threshold: 3
+  artifactory:
+    scale: 1
+    retain_ip: true
+    health_check:
+      port: 8081
+      interval: 5000
+      unhealthy_threshold: 3
+      request_line: 'GET / HTTP/1.0'
+      healthy_threshold: 2
+      response_timeout: 5000

templates/artifactory-oss/README.md

@@ -1,4 +1,5 @@
-# Artifactory OSS
+# Artifactory 
+
 	
 Artifactory is a universal Binary Repository Manager for use by build tools (like Maven and Gradle), 
 dependency management tools (like Ivy and NuGet) and build servers (like Jenkins, Hudson, TeamCity and Bamboo).

templates/artifactory-oss/config.yml

@@ -1,6 +1,6 @@
-name: Artifactory OSS
+name: Artifactory
 description: |
   Artifactory is a universal Binary Repository Manager
-version: 5.4.4
+version: 5.4.5
 category: Repository