From 31b1d13bc6082e7130f5f7b9e5dca5a8564a7938 Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Fri, 27 Jan 2017 12:02:33 +0100 Subject: [PATCH 1/2] fix #3913 : che-server should reuse property of CHE_LOGS_DIR if externally defined Change-Id: I73b8beed66b63f5368edb7b607fbdd96cbf69d93 Signed-off-by: Florent BENOIT --- dockerfiles/che/entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dockerfiles/che/entrypoint.sh b/dockerfiles/che/entrypoint.sh index a27d8787bc7..b2ca8ed1c8b 100755 --- a/dockerfiles/che/entrypoint.sh +++ b/dockerfiles/che/entrypoint.sh @@ -59,6 +59,9 @@ Variables: DEFAULT_CHE_LOG_LEVEL=INFO CHE_LOG_LEVEL=${CHE_LOG_LEVEL:-${DEFAULT_CHE_LOG_LEVEL}} + DEFAULT_CHE_LOGS_DIR="${CATALINA_HOME}/logs/" + export CHE_LOGS_DIR=${CHE_LOGS_DIR:-${DEFAULT_CHE_LOGS_DIR}} + DEFAULT_CHE_DEBUG_SERVER=false CHE_DEBUG_SERVER=${CHE_DEBUG_SERVER:-${DEFAULT_CHE_DEBUG_SERVER}} @@ -112,7 +115,6 @@ set_environment_variables () { export CATALINA_BASE="${CHE_HOME}/tomcat" export ASSEMBLY_BIN_DIR="${CATALINA_HOME}/bin" export CHE_LOGS_LEVEL="${CHE_LOG_LEVEL}" - export CHE_LOGS_DIR="${CATALINA_HOME}/logs/" } docker_exec() { From 41b7521ce95cc7d613d377fe37eb34c0270b3cc1 Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Fri, 27 Jan 2017 12:03:32 +0100 Subject: [PATCH 2/2] machine logs should go in /logs/ folder as well (not in /data) Change-Id: I Signed-off-by: Florent BENOIT --- dockerfiles/init/modules/che/templates/che.env.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/init/modules/che/templates/che.env.erb b/dockerfiles/init/modules/che/templates/che.env.erb index 51a06a39d01..e3f5a504db7 100644 --- a/dockerfiles/init/modules/che/templates/che.env.erb +++ b/dockerfiles/init/modules/che/templates/che.env.erb @@ -8,7 +8,6 @@ CHE_IP=<%= scope.lookupvar('che::che_ip') %> CHE_PORT=<%= scope.lookupvar('che::che_port') %> -CHE_LOGS_DIR=/logs #DOCKER_HOST=<%= scope.lookupvar('che::docker_host') %> #DOCKER_MACHINE_HOST=<%= scope.lookupvar('che::docker_ip') %> @@ -23,7 +22,8 @@ JPDA_ADDRESS=<%= scope.lookupvar('che::che_debug_port') %> CHE_DATABASE=/data CHE_WORKSPACE_STORAGE=/data/workspaces -CHE_WORKSPACE_LOGS=/data/logs/machine +CHE_LOGS_DIR=/logs +CHE_WORKSPACE_LOGS=/logs/machines CHE_TEMPLATE_STORAGE=/data/templates CHE_STACKS_STORAGE=/data/stacks/stacks.json CHE_STACKS_IMAGES=/data/stacks/images