From 9fae2abbc22c2ab69953b1f057069ed3e3bd0047 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Fri, 27 Dec 2024 13:02:56 +0000 Subject: [PATCH 1/2] Not use SHELL command in CM docker --- script/build-dockerfile/dockerinfo.json | 1 - 1 file changed, 1 deletion(-) diff --git a/script/build-dockerfile/dockerinfo.json b/script/build-dockerfile/dockerinfo.json index df9c6c90a..8e848a1b6 100644 --- a/script/build-dockerfile/dockerinfo.json +++ b/script/build-dockerfile/dockerinfo.json @@ -22,7 +22,6 @@ "USER": "cmuser", "GID": "", "GROUP": "cm", - "SHELL": "[\"/bin/bash\", \"-c\"]", "WORKDIR": "/home/cmuser", "distros": { "ubuntu": { From 6bb5618c41c4b40da9e7339d84661dbae312776d Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Fri, 27 Dec 2024 16:45:44 +0000 Subject: [PATCH 2/2] Dont use SHELL command in dockerfile --- script/build-dockerfile/customize.py | 2 +- script/build-dockerfile/dockerinfo.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/script/build-dockerfile/customize.py b/script/build-dockerfile/customize.py index 9c6012aa4..baf0860f8 100644 --- a/script/build-dockerfile/customize.py +++ b/script/build-dockerfile/customize.py @@ -172,7 +172,7 @@ def preprocess(i): shell = get_value(env, config, 'SHELL', 'CM_DOCKER_IMAGE_SHELL') if shell: - f.write('SHELL ' + shell + EOL) + # f.write('SHELL ' + shell + EOL) f.write(EOL) for arg in config['ARGS_DEFAULT']: diff --git a/script/build-dockerfile/dockerinfo.json b/script/build-dockerfile/dockerinfo.json index 8e848a1b6..df9c6c90a 100644 --- a/script/build-dockerfile/dockerinfo.json +++ b/script/build-dockerfile/dockerinfo.json @@ -22,6 +22,7 @@ "USER": "cmuser", "GID": "", "GROUP": "cm", + "SHELL": "[\"/bin/bash\", \"-c\"]", "WORKDIR": "/home/cmuser", "distros": { "ubuntu": {