From 196e4114487767782c14d86c155d3200288d3cb1 Mon Sep 17 00:00:00 2001
From: mklkun <mohamed.khalil.labidi@gmail.com>
Date: Tue, 23 Aug 2022 18:39:51 +0200
Subject: [PATCH] Fix communication issue in containers deployment in SAL

---
 .../java/org/activeeon/morphemic/service/TaskBuilder.java   | 6 +++++-
 .../src/main/resources/start_docker_app.sh                  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
index 9b09f890..25678cb1 100644
--- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
+++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/TaskBuilder.java
@@ -51,7 +51,11 @@ public class TaskBuilder {
 
     private List<ScriptTask> createDockerTask(Task task, String taskNameSuffix, String taskToken, Job job) {
         List<ScriptTask> scriptTasks = new LinkedList<>();
-        ScriptTask scriptTask = PAFactory.createBashScriptTaskFromFile(task.getName() + "_start" + taskNameSuffix, "start_docker_app.sh");
+        ScriptTask scriptTask = PAFactory.createBashScriptTask(
+                task.getName() + "_start" + taskNameSuffix,
+                Utils.getContentWithFileName("export_env_var_script.sh") +
+                        SCRIPTS_SEPARATION_BASH +
+                        Utils.getContentWithFileName("start_docker_app.sh"));
         Map<String, TaskVariable> taskVariablesMap = new HashMap<>();
 
         if (!task.getParentTasks().isEmpty()) {
diff --git a/scheduling-abstraction-layer/src/main/resources/start_docker_app.sh b/scheduling-abstraction-layer/src/main/resources/start_docker_app.sh
index 46115285..ab1a22cb 100644
--- a/scheduling-abstraction-layer/src/main/resources/start_docker_app.sh
+++ b/scheduling-abstraction-layer/src/main/resources/start_docker_app.sh
@@ -46,8 +46,8 @@ if [ "$(docker ps -a --format '{{.Names}}' | grep "^$INSTANCE_NAME$")" ]; then
     echo [ERROR] "$INSTANCE_NAME" is already used by another service instance.
     exit 128
 else
-	echo "docker run --name $INSTANCE_NAME -p $PORTS $ENV_VARS -d $DOCKER_IMAGE"
-	docker run --name $INSTANCE_NAME -p $PORTS $ENV_VARS -d $DOCKER_IMAGE
+	eval echo "docker run --name $INSTANCE_NAME -p $PORTS $ENV_VARS -d $DOCKER_IMAGE"
+	eval "docker run --name $INSTANCE_NAME -p $PORTS $ENV_VARS -d $DOCKER_IMAGE"
 fi
 
 containerID=$(docker ps -aqf "name=^$INSTANCE_NAME$")
-- 
GitLab