From 2ee5120413d41c70cdfa7f9372a94d2ed4268206 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Fri, 18 Oct 2019 08:06:00 +0200 Subject: [PATCH] Archetypes - Add support for ACS 6.2 - New alfresco community and enterprise 6.2.0 profiles - Execute dockerfile as root to avoid issues applying AMPs - Disable transformation service by default in archetypes --- .../src/main/docker/Dockerfile | 6 ++- .../main/docker/alfresco-global.properties | 7 +++- .../src/main/docker/Dockerfile | 6 ++- .../main/docker/alfresco-global.properties | 7 +++- .../docker/docker-compose.yml | 3 ++ pom.xml | 39 ++++++++++++++++++- 6 files changed, 62 insertions(+), 6 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile index 0acd7c64..385d77a1 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile @@ -2,6 +2,8 @@ FROM ${docker.acs.image}:${alfresco.platform.version} ARG TOMCAT_DIR=/usr/local/tomcat +USER root + # Copy Dockerfile to avoid an error if no JARs exist COPY Dockerfile extensions/*.jar $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib/ @@ -15,4 +17,6 @@ COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension # Copy Dockerfile to avoid an error if no license file exists -COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/ \ No newline at end of file +COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/ + +USER ${USERNAME} \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties index aa3f95a2..a382d0db 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties @@ -79,4 +79,9 @@ ftp.enabled=false csrf.filter.enabled=false # Embedded broker without persistence -messaging.broker.url=vm://localhost?broker.persistent=false \ No newline at end of file +messaging.broker.url=vm://localhost?broker.persistent=false + +# Disable ATS +transform.service.enabled=false +local.transform.service.enabled=false +legacy.transform.service.enabled=false diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile index 0acd7c64..385d77a1 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile @@ -2,6 +2,8 @@ FROM ${docker.acs.image}:${alfresco.platform.version} ARG TOMCAT_DIR=/usr/local/tomcat +USER root + # Copy Dockerfile to avoid an error if no JARs exist COPY Dockerfile extensions/*.jar $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib/ @@ -15,4 +17,6 @@ COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension # Copy Dockerfile to avoid an error if no license file exists -COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/ \ No newline at end of file +COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/ + +USER ${USERNAME} \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties index aa3f95a2..45954bcf 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties @@ -79,4 +79,9 @@ ftp.enabled=false csrf.filter.enabled=false # Embedded broker without persistence -messaging.broker.url=vm://localhost?broker.persistent=false \ No newline at end of file +messaging.broker.url=vm://localhost?broker.persistent=false + +# Disable ATS +transform.service.enabled=false +local.transform.service.enabled=false +legacy.transform.service.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index c0963d13..05cfbe37 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -29,6 +29,9 @@ services: # -Dindex.subsystem.name=solr6 # -Dcsrf.filter.enabled=false # -Dmessaging.broker.url=\"vm://localhost?broker.persistent=false\" +# -Dtransform.service.enabled=false +# -Dlocal.transform.service.enabled=false +# -Dlegacy.transform.service.enabled=false # " # ports: # - "${symbol_dollar}{acs.port}:8080" diff --git a/pom.xml b/pom.xml index b4379ef5..aedf3533 100644 --- a/pom.xml +++ b/pom.xml @@ -135,8 +135,8 @@ */*-enterprise*/* acs-community-packaging - 6.1.2-ga - 6.1.0-RC3 + 6.2.0-A9 + 6.2.0-RC2 alfresco/alfresco-content-repository-community alfresco/alfresco-share @@ -318,6 +318,17 @@ + + community-61-tests + + acs-community-packaging + 6.1.2-ga + 6.1.0-RC3 + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + + enterprise-61-tests @@ -329,6 +340,30 @@ + + + + community-62-tests + + acs-community-packaging + 6.2.0-A9 + 6.2.0-RC2 + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + + + + enterprise-62-tests + + acs-packaging + 6.2.0-RC1 + 6.2.0-RC1 + alfresco/alfresco-content-repository + alfresco/alfresco-share + + + sdk-release