From 3cc7a3e3388bd9da0d968acc81e92ec401b6667a Mon Sep 17 00:00:00 2001
From: disaster37 <linuxworkgroup@hotmail.com>
Date: Wed, 27 Jul 2016 23:19:20 +0200
Subject: [PATCH] Upgrade Alfresco to 5.1 201605 GA (#194)

* Upgrade Alfresco to 5.1 201605 GA

* Fix Alfresco upgrade. We upgarde it in 0 template version and we remove the pull always and we add sdekick for data volume

* Fix Release format

* Fix Release format
---
 templates/alfresco/0/README.md           |  6 +++---
 templates/alfresco/0/docker-compose.yml  | 20 +++++++++++++++++---
 templates/alfresco/0/rancher-compose.yml | 14 ++++++++++----
 templates/alfresco/config.yml            |  4 ++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/templates/alfresco/0/README.md b/templates/alfresco/0/README.md
index 0a9862e..5aab44f 100644
--- a/templates/alfresco/0/README.md
+++ b/templates/alfresco/0/README.md
@@ -2,14 +2,14 @@
 
 ### Note:
 
-If you can read French, you can look my [blog](https://blog.webcenter.fr) to look how to upgrade container after deployement for a production usage.
+If you can read French, you can look my [blog](https://blog.webcenter.fr/alfresco-deployer-une-ged-en-production-en-quelques-minutes-docker-rancher/) to look how to upgrade container after deployement for a production usage.
 
 ### Info:
 
 This template deploys a collection of containers based upon the technologies below, once deployed you should have a
  Electronic Document Management (EDM) plateform based on Alfresco.
-* **Alfresco** - Used to manage all aspect of EDM. (https://github.com/disaster37/rancher-alfresco)
-* **Postgresql** - It's the SGBD to store metadatas of your EDM. (https://github.com/docker-library/postgres)
+* **Alfresco** - Used to manage all aspect of ECM. (https://github.com/disaster37/rancher-alfresco)
+* **Postgresql** - It's the SGBD to store metadatas of your ECM. (https://github.com/docker-library/postgres)
 
 This template is just a base to test Alfresco. If you should use in production sky, You must upgrade it after install to setting it in your context (see all parameters you can use to set Alfresco on github). You must at minimal setting that :
 * **Volume** : You must mount a database volume and alfresco volume on storage pool (convoy-gluster is a good idea).
diff --git a/templates/alfresco/0/docker-compose.yml b/templates/alfresco/0/docker-compose.yml
index b9c580c..604f519 100644
--- a/templates/alfresco/0/docker-compose.yml
+++ b/templates/alfresco/0/docker-compose.yml
@@ -3,14 +3,21 @@ alfresco:
     CIFS_ENABLED: 'false'
     FTP_ENABLED: 'false'
   labels:
-    io.rancher.container.pull_image: always'
+    io.rancher.sidekicks: alfresco-data
   tty: true
-  image: webcenter/rancher-alfresco:v5.1.0-2
+  image: webcenter/rancher-alfresco:v5.1-201605-1
   links:
   - postgres:db
   stdin_open: true
   ports:
   - 8080:8080/tcp
+alfresco-data:
+  labels:
+    io.rancher.container.start_once: 'true'
+  image: alpine
+  volumes:
+  - /opt/alfresco/alf_data
+  net: none
 postgres:
   environment:
     PGDATA: /var/lib/postgresql/data/pgdata
@@ -18,7 +25,14 @@ postgres:
     POSTGRES_PASSWORD: ${database_password}
     POSTGRES_USER: ${database_user}
   labels:
-    io.rancher.container.pull_image: always
+    io.rancher.sidekicks: postgres-data
   tty: true
   image: postgres:9.4
   stdin_open: true
+postgres-data:
+  labels:
+    io.rancher.container.start_once: 'true'
+  image: alpine
+  volumes:
+  - /var/lib/postgresql/data/pgdata
+  net: none
diff --git a/templates/alfresco/0/rancher-compose.yml b/templates/alfresco/0/rancher-compose.yml
index 7e1186a..15c8848 100644
--- a/templates/alfresco/0/rancher-compose.yml
+++ b/templates/alfresco/0/rancher-compose.yml
@@ -1,8 +1,8 @@
 .catalog:
   name: "Alfresco"
-  version: "5.1.0"
+  version: "5.1 201605-GA"
   description: "Alfresco Electronic Document Management"
-  uuid: alfresco-5.1.0-2
+  uuid: alfresco-5.1-201605-1
   minimum_rancher_version: v0.56.0
   questions:
     - variable: database_name
@@ -31,7 +31,7 @@ alfresco:
     interval: 5000
     unhealthy_threshold: 3
     strategy: recreate
-    healthy_threshold: 2
+    healthy_threshold: 3
     response_timeout: 5000
 
 postgres:
@@ -42,4 +42,10 @@ postgres:
     unhealthy_threshold: 3
     strategy: recreate
     response_timeout: 5000
-    healthy_threshold: 2
+    healthy_threshold: 3
+
+postgres-data:
+  scale: 1
+
+alfresco-data:
+  scale: 1
diff --git a/templates/alfresco/config.yml b/templates/alfresco/config.yml
index 2b42485..3d04415 100644
--- a/templates/alfresco/config.yml
+++ b/templates/alfresco/config.yml
@@ -1,5 +1,5 @@
 name: Alfresco
 description: |
   An ECM and BPM platform.
-version: 5.1.0
-category: EDM
+version: 5.1 201605-GA
+category: ECM