From a00e6e5645f1beadba1af66f3aa5d87f01966f16 Mon Sep 17 00:00:00 2001 From: gfertuso Date: Fri, 17 Sep 2021 14:33:31 +0100 Subject: [PATCH] Fix user used in Dockerfile --- .../src/main/docker/Dockerfile | 1 + .../src/main/docker/dev-log4j.properties | 2 +- .../resources/archetype-resources/src/main/docker/Dockerfile | 1 + .../archetype-resources/src/main/docker/dev-log4j.properties | 2 +- 4 files 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 385d77a1..8b2d5c19 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 @@ -1,6 +1,7 @@ FROM ${docker.acs.image}:${alfresco.platform.version} ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco USER root diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties index bc9975b6..d7cf832e 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties @@ -14,7 +14,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] #log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n log4j.appender.File=org.apache.log4j.DailyRollingFileAppender -log4j.appender.File.File=alfresco.log +log4j.appender.File.File=logs/alfresco.log log4j.appender.File.Append=true log4j.appender.File.DatePattern='.'yyyy-MM-dd log4j.appender.File.layout=org.apache.log4j.PatternLayout 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 385d77a1..8b2d5c19 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 @@ -1,6 +1,7 @@ FROM ${docker.acs.image}:${alfresco.platform.version} ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco USER root diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties index bc9975b6..d7cf832e 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties @@ -14,7 +14,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] #log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n log4j.appender.File=org.apache.log4j.DailyRollingFileAppender -log4j.appender.File.File=alfresco.log +log4j.appender.File.File=logs/alfresco.log log4j.appender.File.Append=true log4j.appender.File.DatePattern='.'yyyy-MM-dd log4j.appender.File.layout=org.apache.log4j.PatternLayout