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 9b09f89066f17865ebcda4149532f7880199b107..25678cb15059fce7de14d17c411833cd708860d7 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 createDockerTask(Task task, String taskNameSuffix, String taskToken, Job job) { List 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 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 46115285a53559ca02dd18209fb14f49171164f8..ab1a22cb19315eedc6d1606e4a498b38c55be0b2 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$")