From 76ec6007f40520cd59449fe77bff01bccb145700 Mon Sep 17 00:00:00 2001
From: Andrei Rebegea <andrei.rebegea@ness.com>
Date: Fri, 30 Mar 2018 15:20:27 +0300
Subject: [PATCH] REPO-3304: update docker images and rename community

---
 .gitignore                                           | 11 ++++-------
 helm/alfresco-content-services-community/Chart.yaml  | 10 +++++-----
 .../templates/NOTES.txt                              |  2 +-
 .../templates/deployment-solr.yaml                   |  8 ++++++++
 helm/alfresco-content-services-community/values.yaml | 12 ++++++------
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d6c2f8ac..d452a2893 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,20 +18,17 @@ target
 *.log
 *.log.*
 
-# Mobile Tools for Java (J2ME)
-
-.mtj
-.tmp/
 
 # Package Files #
-
 *.jar
 *.war
 *.ear
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
 hs_err_pid*
 
 # Alfresco
-alf_data/
\ No newline at end of file
+alf_data/
+
+helm/alfresco-content-services/charts/*
+helm/alfresco-content-services/requirements.lock
\ No newline at end of file
diff --git a/helm/alfresco-content-services-community/Chart.yaml b/helm/alfresco-content-services-community/Chart.yaml
index 9091863fd..af20ed3db 100644
--- a/helm/alfresco-content-services-community/Chart.yaml
+++ b/helm/alfresco-content-services-community/Chart.yaml
@@ -1,13 +1,13 @@
-name: alfresco-content-services
+name: alfresco-content-services-community
 version: 0.0.1
-description: A Helm chart for deploying Alfresco Content Services
+description: A Helm chart for deploying Alfresco Content Services Community
 keywords:
-- content
-- content services
 - alfresco
 - community
 - alfresco community
+- content
+- content services
 home: https://www.alfresco.com
 sources:
-- https://github.com/Alfresco/acs-community-full-packaging/tree/master/helm
+- https://github.com/Alfresco/acs-community-packaging/tree/master/helm
 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
\ No newline at end of file
diff --git a/helm/alfresco-content-services-community/templates/NOTES.txt b/helm/alfresco-content-services-community/templates/NOTES.txt
index 5bffa0a5b..f225c5c54 100644
--- a/helm/alfresco-content-services-community/templates/NOTES.txt
+++ b/helm/alfresco-content-services-community/templates/NOTES.txt
@@ -1,7 +1,7 @@
 
 {{ if .Values.dnsaddress }}
 
-You can access all components of Alfresco Content Services using the same root address, but different paths as follows:
+You can access all components of Alfresco Content Services Community using the same root address, but different paths as follows:
 
   Content: {{ .Values.dnsaddress }}/alfresco
   Share: {{ .Values.dnsaddress }}/share
diff --git a/helm/alfresco-content-services-community/templates/deployment-solr.yaml b/helm/alfresco-content-services-community/templates/deployment-solr.yaml
index 23f0aea65..3b1cef6a2 100644
--- a/helm/alfresco-content-services-community/templates/deployment-solr.yaml
+++ b/helm/alfresco-content-services-community/templates/deployment-solr.yaml
@@ -32,6 +32,14 @@ spec:
           - name: data
             mountPath: {{ .Values.persistence.solr.data.mountPath }}
             subPath: {{ .Values.persistence.solr.data.subPath }}
+      initContainers:
+        - name: init-db
+          image: busybox
+          command: ["sh", "-c", "chown -R 1000:1000 {{ .Values.persistence.solr.data.mountPath }}"]
+          volumeMounts:
+          - name: data
+            mountPath: {{ .Values.persistence.solr.data.mountPath }}
+            subPath: {{ .Values.persistence.solr.data.subPath }}
       volumes:
       - name: data
         persistentVolumeClaim:
diff --git a/helm/alfresco-content-services-community/values.yaml b/helm/alfresco-content-services-community/values.yaml
index 24ad5e9d0..209aa9d8b 100644
--- a/helm/alfresco-content-services-community/values.yaml
+++ b/helm/alfresco-content-services-community/values.yaml
@@ -7,8 +7,8 @@ registryPullSecrets: quay-registry-secret
 repository:
   replicaCount: 1
   image:
-    repository: quay.io/alfresco/alfresco-content-services-community
-    tag: "latest"
+    repository: alfresco/alfresco-content-repository-community
+    tag: "6.0.4-ea"
     pullPolicy: Always
     internalPort: 8080
   service:
@@ -30,8 +30,8 @@ repository:
 share:
   replicaCount: 1
   image:
-    repository: quay.io/alfresco/alfresco-share
-    tag: "6.0"
+    repository: alfresco/alfresco-share
+    tag: "6.0.a"
     pullPolicy: Always
     internalPort: 8080
   service:
@@ -49,8 +49,8 @@ share:
 solr:
   replicaCount: 1
   image:
-    repository: quay.io/alfresco/search-services
-    tag: "1.2.0-SNAPSHOT"
+    repository: alfresco/alfresco-search-services
+    tag: "1.1.0"
     pullPolicy: Always
     internalPort: 8983
   service: