Merge pull request StatCan#375 from StatCan/daaas-1100

fix(code-server): change code-server source from forked repo to upstr…
wycc · Sep 6, 2022 · 9c8c5e4 · 9c8c5e4
2 parents 5868a12 + a8458b5
commit 9c8c5e4
Show file tree

Hide file tree

Showing 21 changed files with 90 additions and 48 deletions.
diff --git a/docker-bits/6_jupyterlab.Dockerfile b/docker-bits/6_jupyterlab.Dockerfile
@@ -11,27 +11,29 @@
 # TODO: use official package jupyterlab-language-pack-fr-FR when released by Jupyterlab instead of the StatCan/jupyterlab-language-pack-fr_FR repo.
 
 # Install vscode
-ARG VSCODE_VERSION=3.10.2-nodownload-v3
-ARG VSCODE_SHA=62429655dedfdf5d19db88cf06da01c91413f402eae268ee3b90c041ebc6f622
-ARG VSCODE_URL=https://github.com/StatCan/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
+ARG VSCODE_VERSION=4.5.1
+ARG VSCODE_SHA=f43e217706044aea9d8ae4f8ce1185c3ebfadf980bcf668ab94ecccb70e99709
+ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
 
 USER root
+
+ENV CS_DISABLE_FILE_DOWNLOADS=1
+ENV XDG_DATA_HOME=$HOME/.local/share
+ENV SERVICE_URL=https://extensions.coder.com/api
+
 RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
     && echo "${VSCODE_SHA}  ./vscode.deb" | sha256sum -c - \
     && apt-get update \
     && apt-get install -y nginx \
     && dpkg -i ./vscode.deb \
     && rm ./vscode.deb \
     && rm -f /etc/apt/sources.list.d/vscode.list \
-    && mkdir -p /etc/share/code-server/extensions
+    && mkdir -p $XDG_DATA_HOME/code-server/extensions 
 
 # Fix for VSCode extensions and CORS
-ENV XDG_DATA_HOME=/etc/share
-ENV SERVICE_URL=https://extensions.coder.com/api
-COPY vscode-overrides.json $XDG_DATA_HOME/code-server/User/settings.json
-ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 # Languagepacks.json needs to exist for code-server to recognize the languagepack
 COPY languagepacks.json $XDG_DATA_HOME/code-server/
+ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 
 RUN VS_PYTHON_VERSION="2021.5.829140558" && \
     wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix && \

diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/docker-stacks-datascience-notebook/vscode-overrides.json b/output/docker-stacks-datascience-notebook/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -163,27 +163,29 @@ RUN apt-get update && \
 # TODO: use official package jupyterlab-language-pack-fr-FR when released by Jupyterlab instead of the StatCan/jupyterlab-language-pack-fr_FR repo.
 
 # Install vscode
-ARG VSCODE_VERSION=3.10.2-nodownload-v3
-ARG VSCODE_SHA=62429655dedfdf5d19db88cf06da01c91413f402eae268ee3b90c041ebc6f622
-ARG VSCODE_URL=https://github.com/StatCan/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
+ARG VSCODE_VERSION=4.5.1
+ARG VSCODE_SHA=f43e217706044aea9d8ae4f8ce1185c3ebfadf980bcf668ab94ecccb70e99709
+ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
 
 USER root
+
+ENV CS_DISABLE_FILE_DOWNLOADS=1
+ENV XDG_DATA_HOME=$HOME/.local/share
+ENV SERVICE_URL=https://extensions.coder.com/api
+
 RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
     && echo "${VSCODE_SHA}  ./vscode.deb" | sha256sum -c - \
     && apt-get update \
     && apt-get install -y nginx \
     && dpkg -i ./vscode.deb \
     && rm ./vscode.deb \
     && rm -f /etc/apt/sources.list.d/vscode.list \
-    && mkdir -p /etc/share/code-server/extensions
+    && mkdir -p $XDG_DATA_HOME/code-server/extensions 
 
 # Fix for VSCode extensions and CORS
-ENV XDG_DATA_HOME=/etc/share
-ENV SERVICE_URL=https://extensions.coder.com/api
-COPY vscode-overrides.json $XDG_DATA_HOME/code-server/User/settings.json
-ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 # Languagepacks.json needs to exist for code-server to recognize the languagepack
 COPY languagepacks.json $XDG_DATA_HOME/code-server/
+ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 
 RUN VS_PYTHON_VERSION="2021.5.829140558" && \
     wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix && \

diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/jupyterlab-cpu/vscode-overrides.json b/output/jupyterlab-cpu/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -247,27 +247,29 @@ RUN apt-get update && \
 # TODO: use official package jupyterlab-language-pack-fr-FR when released by Jupyterlab instead of the StatCan/jupyterlab-language-pack-fr_FR repo.
 
 # Install vscode
-ARG VSCODE_VERSION=3.10.2-nodownload-v3
-ARG VSCODE_SHA=62429655dedfdf5d19db88cf06da01c91413f402eae268ee3b90c041ebc6f622
-ARG VSCODE_URL=https://github.com/StatCan/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
+ARG VSCODE_VERSION=4.5.1
+ARG VSCODE_SHA=f43e217706044aea9d8ae4f8ce1185c3ebfadf980bcf668ab94ecccb70e99709
+ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
 
 USER root
+
+ENV CS_DISABLE_FILE_DOWNLOADS=1
+ENV XDG_DATA_HOME=$HOME/.local/share
+ENV SERVICE_URL=https://extensions.coder.com/api
+
 RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
     && echo "${VSCODE_SHA}  ./vscode.deb" | sha256sum -c - \
     && apt-get update \
     && apt-get install -y nginx \
     && dpkg -i ./vscode.deb \
     && rm ./vscode.deb \
     && rm -f /etc/apt/sources.list.d/vscode.list \
-    && mkdir -p /etc/share/code-server/extensions
+    && mkdir -p $XDG_DATA_HOME/code-server/extensions 
 
 # Fix for VSCode extensions and CORS
-ENV XDG_DATA_HOME=/etc/share
-ENV SERVICE_URL=https://extensions.coder.com/api
-COPY vscode-overrides.json $XDG_DATA_HOME/code-server/User/settings.json
-ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 # Languagepacks.json needs to exist for code-server to recognize the languagepack
 COPY languagepacks.json $XDG_DATA_HOME/code-server/
+ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 
 RUN VS_PYTHON_VERSION="2021.5.829140558" && \
     wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix && \

diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/jupyterlab-pytorch/vscode-overrides.json b/output/jupyterlab-pytorch/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -256,27 +256,29 @@ RUN apt-get update && \
 # TODO: use official package jupyterlab-language-pack-fr-FR when released by Jupyterlab instead of the StatCan/jupyterlab-language-pack-fr_FR repo.
 
 # Install vscode
-ARG VSCODE_VERSION=3.10.2-nodownload-v3
-ARG VSCODE_SHA=62429655dedfdf5d19db88cf06da01c91413f402eae268ee3b90c041ebc6f622
-ARG VSCODE_URL=https://github.com/StatCan/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
+ARG VSCODE_VERSION=4.5.1
+ARG VSCODE_SHA=f43e217706044aea9d8ae4f8ce1185c3ebfadf980bcf668ab94ecccb70e99709
+ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
 
 USER root
+
+ENV CS_DISABLE_FILE_DOWNLOADS=1
+ENV XDG_DATA_HOME=$HOME/.local/share
+ENV SERVICE_URL=https://extensions.coder.com/api
+
 RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
     && echo "${VSCODE_SHA}  ./vscode.deb" | sha256sum -c - \
     && apt-get update \
     && apt-get install -y nginx \
     && dpkg -i ./vscode.deb \
     && rm ./vscode.deb \
     && rm -f /etc/apt/sources.list.d/vscode.list \
-    && mkdir -p /etc/share/code-server/extensions
+    && mkdir -p $XDG_DATA_HOME/code-server/extensions 
 
 # Fix for VSCode extensions and CORS
-ENV XDG_DATA_HOME=/etc/share
-ENV SERVICE_URL=https://extensions.coder.com/api
-COPY vscode-overrides.json $XDG_DATA_HOME/code-server/User/settings.json
-ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 # Languagepacks.json needs to exist for code-server to recognize the languagepack
 COPY languagepacks.json $XDG_DATA_HOME/code-server/
+ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 
 RUN VS_PYTHON_VERSION="2021.5.829140558" && \
     wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix && \

diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/jupyterlab-tensorflow/vscode-overrides.json b/output/jupyterlab-tensorflow/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/remote-desktop/vscode-overrides.json b/output/remote-desktop/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/rstudio/vscode-overrides.json b/output/rstudio/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -158,27 +158,29 @@ RUN apt-get update && \
 # TODO: use official package jupyterlab-language-pack-fr-FR when released by Jupyterlab instead of the StatCan/jupyterlab-language-pack-fr_FR repo.
 
 # Install vscode
-ARG VSCODE_VERSION=3.10.2-nodownload-v3
-ARG VSCODE_SHA=62429655dedfdf5d19db88cf06da01c91413f402eae268ee3b90c041ebc6f622
-ARG VSCODE_URL=https://github.com/StatCan/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
+ARG VSCODE_VERSION=4.5.1
+ARG VSCODE_SHA=f43e217706044aea9d8ae4f8ce1185c3ebfadf980bcf668ab94ecccb70e99709
+ARG VSCODE_URL=https://github.com/coder/code-server/releases/download/v${VSCODE_VERSION}/code-server_${VSCODE_VERSION}_amd64.deb
 
 USER root
+
+ENV CS_DISABLE_FILE_DOWNLOADS=1
+ENV XDG_DATA_HOME=$HOME/.local/share
+ENV SERVICE_URL=https://extensions.coder.com/api
+
 RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
     && echo "${VSCODE_SHA}  ./vscode.deb" | sha256sum -c - \
     && apt-get update \
     && apt-get install -y nginx \
     && dpkg -i ./vscode.deb \
     && rm ./vscode.deb \
     && rm -f /etc/apt/sources.list.d/vscode.list \
-    && mkdir -p /etc/share/code-server/extensions
+    && mkdir -p $XDG_DATA_HOME/code-server/extensions 
 
 # Fix for VSCode extensions and CORS
-ENV XDG_DATA_HOME=/etc/share
-ENV SERVICE_URL=https://extensions.coder.com/api
-COPY vscode-overrides.json $XDG_DATA_HOME/code-server/User/settings.json
-ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 # Languagepacks.json needs to exist for code-server to recognize the languagepack
 COPY languagepacks.json $XDG_DATA_HOME/code-server/
+ARG SHA256py=d32d8737858661451705faa9f176f8a1a03485b2d9984de40d45cc0403a3bcf4
 
 RUN VS_PYTHON_VERSION="2021.5.829140558" && \
     wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix && \

diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/output/sas/vscode-overrides.json b/output/sas/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }
diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh
@@ -93,3 +93,8 @@ printenv | grep KUBERNETES >> /opt/conda/lib/R/etc/Renviron
                  --ServerApp.base_url=${NB_PREFIX} \
                  --ServerApp.default_url=${DEFAULT_JUPYTER_URL:-/tree}
 
+# persist vscode server remote settings (Machine dir)
+VS_CODE_SETTINGS=${XDG_DATA_HOME}/code-server/Machine/settings.json
+if [! -f "$VS_CODE_SETTINGS" ]; then
+    cp vscode-overrides.json "$VS_CODE_SETTINGS"
+fi
diff --git a/resources/common/vscode-overrides.json b/resources/common/vscode-overrides.json
@@ -1,4 +1,3 @@
 {
     "workbench.colorTheme": "Default Dark+",
-    "extensions.autoUpdate": false
 }