Replace custom images by Alfresco's images

+ Update README

Issue: #168777
Change-Id: I3834d5976895d1510895ceb0a341773e86968e94

README.md

@@ -9,7 +9,7 @@ This app displays sites and repository usage info: number of created/read/update
 In sites, others informations are "audited" concerning wiki, blog and discussions components but also users connected and sites volumetry.  
 
 Works with:
- - Alfresco Enterprise 4.2.x, 5.0.x, 5.1.x, 5.2.x, 6.1.X, 6.2.x, 7.0.x, 7.1.X (should works on Community versions but not tested)
+ - Alfresco Enterprise 4.2.x, 5.0.x, 5.1.x, 5.2.x, 6.1.X, 6.2.x, 7.0.x, 7.1.X, 7.2.X, 7.3.X (should works on Community versions but not tested)
 
 
 Building the module
@@ -19,7 +19,7 @@ Check out the project if you have not already done so
         git clone https://github.com/atolcd/alfresco-audit-share.git
 
 Maven build scripts are provided to build AMP files containing the custom files.  
-**Before building, ensure you have correctly configured repositories in the parent pom.xml file (alfresco-public for Community, alfresco-private-repository for Enterprise).**  
+**Before building, ensure you have correctly configured repositories in the parent pom.xml and docker-compose.yml files (alfresco-public for Community, alfresco-private-repository for Enterprise).**  
 
 To build AMP files, run the following command from the base project directory:
 
@@ -98,6 +98,7 @@ Contributors:
 - [Laurent MEUNIER](https://github.com/lmeunier)
 - [Zylknet](https://www.zylk.net)
 - [Etienne PERRIER](https://github.com/etienneperrier)
+- [Fabien CHENE](https://github.com/CheneFabien)
 
 
 

audit-share-platform-docker/src/main/docker/alfresco-global.properties

@@ -59,7 +59,8 @@ db.driver=org.postgresql.Driver
 index.subsystem.name=solr6
 solr.host=audit-share-ass
 solr.port=8983
-solr.secureComms=https
+solr.secureComms=secret
+solr.sharedSecret=secret
 solr.alfresco.port.ssl=8983
 solr.port.ssl=8983
 dir.keystore=/usr/local/tomcat/keystores

docker/docker-compose.yml

@@ -51,11 +51,14 @@ services:
     image: ${docker.ass.image}:${alfresco.ass.version}
     environment:
       SOLR_ALFRESCO_HOST: audit-share-acs
-      SOLR_ALFRESCO_PORT: 8983
+      SOLR_ALFRESCO_PORT: 8080
       SOLR_SOLR_HOST: audit-share-ass
       SOLR_SOLR_PORT: 8983
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-      ALFRESCO_SECURE_COMMS: https
+      ALFRESCO_SECURE_COMMS: "secret"
+      # SHARED SECRET VALUE
+      JAVA_TOOL_OPTIONS: "
+        -Dalfresco.secureComms.secret=secret"
     ports:
       - "8983:8983"
     volumes:
@@ -75,8 +78,9 @@ services:
     links:
       - activemq
 
+  # Block to comment in Community version
   transform-router:
-    image: docker-alfresco-mirror.priv.atolcd.com/alfresco/alfresco-transform-router:1.5.3
+    image: quay.io/alfresco/alfresco-transform-router:2.0.0
     environment:
       JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
       ACTIVEMQ_URL: "nio://activemq:61616"
@@ -88,7 +92,8 @@ services:
       - activemq
 
   shared-file-store:
-    image: docker-alfresco-mirror.priv.atolcd.com/alfresco/alfresco-shared-file-store:1.5.3
+    image: quay.io/alfresco/alfresco-shared-file-store:2.0.0
+    # Community : alfresco/alfresco-shared-file-store:0.16.1
     environment:
       JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
       scheduler.content.age.millis: 86400000
@@ -99,7 +104,7 @@ services:
       - sfs-data:/tmp/Alfresco/sfs
 
 #  transform-dte-engine:
-#    image: docker-alfresco-mirror.priv.atolcd.com/alfresco/transform-dte-engine:1.2.0
+#    image: alfresco/transform-dte-engine:1.2.0
 #    environment:
 #      JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -DdteServerUrl=http://alfresco-dte.dvt.cloud.priv.atolcd.com:8080/transformation-backend"
 #      ACTIVEMQ_URL: "nio://activemq:61616"

pom.xml

@@ -27,17 +27,23 @@
     <alfresco.share.version>17.137</alfresco.share.version>
     <alfresco.share.docker.version>7.3.1</alfresco.share.docker.version>
 
-    <!-- Docker images -->
-    <docker.acs.image>client-docker-registry.atolcd.com/alfresco/base-images/alfresco-content-repository-atolcd</docker.acs.image>
-    <docker.share.image>client-docker-registry.atolcd.com/alfresco/base-images/alfresco-share-atolcd</docker.share.image>
-    <docker.ass.image>client-docker-registry.atolcd.com/alfresco/base-images/alfresco-search-services-atolcd</docker.ass.image>
-    <docker.activemq.image>client-docker-registry.atolcd.com/alfresco/base-images/alfresco-activemq-atolcd</docker.activemq.image>
+    <!-- Docker Enterprise images -->
+    <docker.acs.image>quay.io/alfresco/alfresco-content-repository</docker.acs.image>
+    <docker.share.image>quay.io/alfresco/alfresco-share</docker.share.image>
+
+    <!-- Docker Community images -->
+    <!-- <docker.acs.image>alfresco/alfresco-content-repository-community</docker.acs.image>
+    <docker.share.image>alfresco/alfresco-share</docker.share.image> -->
+
+    <docker.ass.image>alfresco/alfresco-search-services</docker.ass.image>
+    <docker.activemq.image>alfresco/alfresco-activemq</docker.activemq.image>
 
     <!-- Alfresco search service -->
     <alfresco.ass.version>2.0.6</alfresco.ass.version>
 
     <!-- ActiveMQ -->
-    <activemq.version>5.17.1</activemq.version>
+    <activemq.version>5.17.1-jre11-rockylinux8</activemq.version>
+    <apache.activemq.version>5.17.1</apache.activemq.version>
 
     <!-- Environment configuration properties -->
     <share.port>8180</share.port>
@@ -88,7 +94,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-all</artifactId>
-      <version>${activemq.version}</version>
+      <version>${apache.activemq.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>