From acfee1cb239df574c34a6fc6277bee20cf997bc4 Mon Sep 17 00:00:00 2001
From: Raul Sanchez <rawmind@gmail.com>
Date: Mon, 24 Jul 2017 18:14:52 +0200
Subject: [PATCH] Updated README.md

---
 templates/artifactory-oss/0/README.md         | 38 +++++++++++++++++++
 .../artifactory-oss/0/docker-compose.yml.tpl  |  4 +-
 .../artifactory-oss/0/rancher-compose.yml     |  8 ++--
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/templates/artifactory-oss/0/README.md b/templates/artifactory-oss/0/README.md
index f6e1271..e0298ba 100644
--- a/templates/artifactory-oss/0/README.md
+++ b/templates/artifactory-oss/0/README.md
@@ -7,6 +7,44 @@ Repository managers serve two purposes: they act as highly configurable proxies
 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. 
+ - Select artifactory release, OSS or PRO.
+ - Set the params and select certificate.
+
+ Click "Launch".
+
+### Notes:
+
+- To use the PRO version, you need to get a free trial.
+- You need a certificate imported in rancher enviroment before deploy this package. 
+- If you use self signed certificates, you should implement [self-signed-certificates][using-self-signed-certificates] in your hosts.
+- If you use http schema, you should implement [insecure-registry][insecure-registry] in your hosts.
+
+
+### More info:
+
+- [Resources][artifactory-resources]
+- [Free-trial][artifactory-trial]
+- [Self-signed-certificates][using-self-signed-certificates]
+- [Insecure-registry][insecure-registry]
+
+
+[artifactory]: https://www.jfrog.com/artifactory/
+[artifactory-resources]: https://www.jfrog.com/support-service/resources/
+[artifactory-trial]: https://www.jfrog.com/artifactory/free-trial/
+[using-self-signed-certificates]: https://docs.docker.com/registry/insecure/#using-self-signed-certificates
+[insecure-registry]: https://docs.docker.com/registry/insecure/# 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. 
diff --git a/templates/artifactory-oss/0/docker-compose.yml.tpl b/templates/artifactory-oss/0/docker-compose.yml.tpl
index 7c90946..92260da 100644
--- a/templates/artifactory-oss/0/docker-compose.yml.tpl
+++ b/templates/artifactory-oss/0/docker-compose.yml.tpl
@@ -10,8 +10,10 @@ services:
      - artifactory-data:/var/opt/jfrog/artifactory
     environment:
      - EXTRA_JAVA_OPTIONS=${EXTRA_JAVA_OPTIONS}
-  artifactory-rb:
+  artifactory-rp:
     image: rawmind/alpine-nginx:1.12.1-3
+    external_links:
+      - artifactory:artifactory
     environment:
       NGINX_SERVER_NAME: artifactory
       NGINX_SERVER_CONF: |
diff --git a/templates/artifactory-oss/0/rancher-compose.yml b/templates/artifactory-oss/0/rancher-compose.yml
index 2dc5d77..c8459aa 100644
--- a/templates/artifactory-oss/0/rancher-compose.yml
+++ b/templates/artifactory-oss/0/rancher-compose.yml
@@ -17,7 +17,7 @@ catalog:
     - variable: "PUBLISH_SCHEMA"
       description: "Publish schema" 
       label: "Publish schema:"
-      required: false
+      required: true
       default: "https"
       type: "enum"
       options:
@@ -38,7 +38,7 @@ catalog:
       type: "int"
       default: 8081
     - variable: "SSL_CERT"
-      description: "SSL certificate. Mandatory if schema https." 
+      description: "Select SSL certificate." 
       label: "SSL certificate:"
       required: true
       default: ""
@@ -63,7 +63,7 @@ services:
       default_cert: ${SSL_CERT}
       port_rules:
       - protocol: ${PUBLISH_SCHEMA}
-        service: artifactory-rb
+        service: artifactory-rp
         source_port: ${PUBLISH_PORT}
         target_port: ${PUBLISH_PORT}
     health_check:
@@ -71,7 +71,7 @@ services:
       healthy_threshold: 2
       port: 42
       unhealthy_threshold: 3
-  artifactory-rb:
+  artifactory-rp:
     scale: 1
     retain_ip: true
     health_check: