Mojo: Update to v24.5.0

Author: benz0li

.devcontainer/.gitignore

@@ -44,6 +44,10 @@
 !/mojo-base/conf/jupyterlab/usr/local/etc/
 !/mojo-base/conf/jupyterlab/usr/local/etc/jupyter/
 !/mojo-base/conf/jupyterlab/usr/local/etc/jupyter/jupyter_server_config.d/
+!/mojo-base/scripts/
+!/mojo-base/scripts/usr/
+!/mojo-base/scripts/usr/local/
+!/mojo-base/scripts/usr/local/bin/
 !/python-*/
 !/r-*/
 !/r-base/
@@ -86,6 +90,7 @@
 !/julia-base/scripts/usr/local/bin/*.sh
 !/mojo-*/devcontainer.json
 !/mojo-base/conf/jupyterlab/usr/local/etc/jupyter/jupyter_server_config.d/mojo-lsp-server.json
+!/mojo-base/scripts/usr/local/bin/*.sh
 !/python-*/devcontainer.json
 !/r-*/devcontainer.json
 !/r-base/conf/jupyterlab/usr/local/share/jupyter/lab/settings/*.json

.devcontainer/Mojo.Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILD_ON_IMAGE=glcr.b-data.ch/mojo/base
-ARG MOJO_VERSION=24.4.0
+ARG MOJO_VERSION=24.5.0
 
 ARG INSTALL_DEVTOOLS
 ARG NODE_VERSION
@@ -18,17 +18,10 @@ COPY conf/ipython /files
 COPY conf/jupyterlab /files
 COPY conf/shell /files
 COPY mojo-base/conf/jupyterlab /files
+COPY mojo-base/scripts /files
 COPY scripts /files
 
-RUN if echo "$BUILD_ON_IMAGE" | grep -q "mojo-max"; then \
-    ## Update Modular setup
-    sed -i s/packages.modular.com_mojo/packages.modular.com_max/g \
-      /files/usr/local/etc/jupyter/jupyter_server_config.d/mojo-lsp-server.json; \
-  elif [ "${MOJO_VERSION}" = "nightly" ]; then \
-    sed -i s/packages.modular.com_mojo/packages.modular.com_nightly_mojo/g \
-      /files/usr/local/etc/jupyter/jupyter_server_config.d/mojo-lsp-server.json; \
-  fi \
-  && if [ -n "${CUDA_VERSION}" ]; then \
+RUN if [ -n "${CUDA_VERSION}" ]; then \
     ## Use entrypoint of CUDA image
     mv /opt/nvidia/entrypoint.d /opt/nvidia/nvidia_entrypoint.sh \
       /files/usr/local/bin; \

.devcontainer/mojo-base-nightly/devcontainer.json

@@ -18,7 +18,7 @@
 
   "onCreateCommand": "onCreateCommand.sh",
   "postStartCommand": "${HOME}/.local/bin/dockerSystemPrune.sh",
-  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh",
+  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh && postAttachCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/mojo-base/conf/jupyterlab/usr/local/etc/jupyter/jupyter_server_config.d/mojo-lsp-server.json

@@ -3,7 +3,7 @@
     "language_servers": {
       "mojo": {
         "argv": [
-          "/opt/modular/pkg/packages.modular.com_mojo/bin/mojo-lsp-server",
+          "/opt/modular/bin/mojo-lsp-server",
           "--log=error"
         ],
         "version": 2,

.devcontainer/mojo-base/devcontainer.json

@@ -5,7 +5,7 @@
     "context": "..",
     "args": {
       "BUILD_ON_IMAGE": "glcr.b-data.ch/mojo/base",
-      "MOJO_VERSION": "24.4.0",
+      "MOJO_VERSION": "24.5.0",
       // "UNMINIMIZE": "unset-to-keep-minimized",
       "JUPYTERLAB_VERSION": "4.2.5",
       // "INSTALL_DEVTOOLS": "unset-to-not-install",
@@ -18,7 +18,7 @@
 
   "onCreateCommand": "onCreateCommand.sh",
   "postStartCommand": "${HOME}/.local/bin/dockerSystemPrune.sh",
-  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh",
+  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh && postAttachCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/mojo-base/scripts/usr/local/bin/postAttachCommand.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Copyright (c) 2024 b-data GmbH.
+# Distributed under the terms of the MIT License.
+
+set -e
+
+# MAX SDK: Evaluate and set version
+if [ "${MOJO_VERSION}" = "nightly" ]; then
+  extDataDir=$HOME/.vscode-server/data/User/globalStorage/modular-mojotools.vscode-mojo-nightly
+  while :
+    do
+    extDirs=( "$HOME"/.vscode-server/extensions/modular-mojotools.vscode-mojo-nightly* )
+    [ "${#extDirs[@]}" -ge 2 ] && exit 1
+    if [ -d "${extDirs[0]}" ]; then
+      sdkVersion=$(jq -r '.sdkVersion' "${extDirs[0]}/package.json")
+      break
+    else
+      sleep 1
+    fi
+  done
+else
+  extDataDir=$HOME/.vscode-server/data/User/globalStorage/modular-mojotools.vscode-mojo
+  sdkVersion=$MOJO_VERSION
+fi
+
+# MAX SDK: Create symlink to /opt/modular
+mkdir -p "$extDataDir/magic-data-home/envs"
+ln -snf /opt/modular "$extDataDir/magic-data-home/envs/max"
+mkdir -p "$extDataDir/versionDone/$sdkVersion"

.devcontainer/mojo-scipy-nightly/devcontainer.json

@@ -18,7 +18,7 @@
 
   "onCreateCommand": "onCreateCommand.sh",
   "postStartCommand": "${HOME}/.local/bin/dockerSystemPrune.sh",
-  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh",
+  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh && postAttachCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/mojo-scipy/devcontainer.json

@@ -5,7 +5,7 @@
     "context": "..",
     "args": {
       "BUILD_ON_IMAGE": "glcr.b-data.ch/mojo/scipy",
-      "MOJO_VERSION": "24.4.0",
+      "MOJO_VERSION": "24.5.0",
       // "UNMINIMIZE": "unset-to-keep-minimized",
       "JUPYTERLAB_VERSION": "4.2.5",
       // "INSTALL_DEVTOOLS": "unset-to-not-install",
@@ -18,7 +18,7 @@
 
   "onCreateCommand": "onCreateCommand.sh",
   "postStartCommand": "${HOME}/.local/bin/dockerSystemPrune.sh",
-  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh",
+  "postAttachCommand": "${HOME}/.local/bin/checkForUpdates.sh && postAttachCommand.sh",
 
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {