From 4a8553c5338dd7d41c4d4209fec1b61cc5e1a58b Mon Sep 17 00:00:00 2001
From: Tian Wang <133085652+aws-tianquaw@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:27:15 -0700
Subject: [PATCH 1/2] Fix code editor copy command in v2 Dockerfile

---
 template/v2/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/v2/Dockerfile b/template/v2/Dockerfile
index 7d5306ae..bc6b2fb2 100644
--- a/template/v2/Dockerfile
+++ b/template/v2/Dockerfile
@@ -95,7 +95,7 @@ RUN if [[ -z $ARG_BASED_ENV_IN_FILENAME ]] ; \
         sagemaker-code-editor --install-extension "${ext}" --extensions-dir "${extensionloc}" --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data; \
        done \
     # Copy the settings
-    && cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json && \
+    && cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json \
     && cp /etc/code-editor/code_editor_user_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/User/settings.json && \
     # Install glue kernels, and move to shared directory
     # Also patching base kernel so Studio background code doesn't start session silently

From 95f9f846e8f38fd0ebd16a5955c30b7794107f44 Mon Sep 17 00:00:00 2001
From: Tian Wang <133085652+aws-tianquaw@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:29:00 -0700
Subject: [PATCH 2/2] Apply code-editor changes to v3 Dockerfile

---
 template/v3/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/v3/Dockerfile b/template/v3/Dockerfile
index 26881dc8..3c628dd8 100644
--- a/template/v3/Dockerfile
+++ b/template/v3/Dockerfile
@@ -92,7 +92,8 @@ RUN if [[ -z $ARG_BASED_ENV_IN_FILENAME ]] ; \
         sagemaker-code-editor --install-extension "${ext}" --extensions-dir "${extensionloc}" --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data; \
        done \
     # Copy the settings
-    && cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json && \
+    && cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json \
+    && cp /etc/code-editor/code_editor_user_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/User/settings.json && \
     # Install glue kernels, and move to shared directory
     # Also patching base kernel so Studio background code doesn't start session silently
     install-glue-kernels && \