From 27258b025e819538c28494fd68a62e33802f97e0 Mon Sep 17 00:00:00 2001 From: narkuss Date: Tue, 14 May 2019 00:08:06 +0200 Subject: [PATCH 1/2] Update Dockerfile Merge alfresco-global.properties, instead of copying and replacing the default one --- .../src/main/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 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..79fb150c 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 @@ -10,9 +10,11 @@ COPY Dockerfile extensions/*.amp $TOMCAT_DIR/amps/ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \ $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force -COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties +COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global-dev.properties +RUN mv $TOMCAT_DIR/shared/classes/alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global-orig.properties \ + && awk -F= '!a[$1]++' $TOMCAT_DIR/shared/classes/alfresco-global-dev.properties $TOMCAT_DIR/shared/classes/alfresco-global-orig.properties > $TOMCAT_DIR/shared/classes/alfresco-global.properties 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/ From 087da885ef0258757f9c222e50ede5b78369ed0c Mon Sep 17 00:00:00 2001 From: narkuss Date: Tue, 14 May 2019 00:08:44 +0200 Subject: [PATCH 2/2] Update Dockerfile Merge alfresco-global.properties, instead of copying and replacing the default one --- .../archetype-resources/src/main/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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..79fb150c 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 @@ -10,9 +10,11 @@ COPY Dockerfile extensions/*.amp $TOMCAT_DIR/amps/ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \ $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force -COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties +COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global-dev.properties +RUN mv $TOMCAT_DIR/shared/classes/alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global-orig.properties \ + && awk -F= '!a[$1]++' $TOMCAT_DIR/shared/classes/alfresco-global-dev.properties $TOMCAT_DIR/shared/classes/alfresco-global-orig.properties > $TOMCAT_DIR/shared/classes/alfresco-global.properties 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/