UBI9 support (#33)

Signed-off-by: Artem Zatsarynnyi <[email protected]>

Author: azatsarynnyy

build/dockerfiles/Dockerfile

@@ -25,8 +25,6 @@ USER 0
 
 COPY --chmod=755 /build/scripts/*.sh /
 COPY /status-app/ /status-app/
-# Copy the JetBrains IDE's config where some settings are overridden for Che CDE needs.
-COPY /build/jetbrains_configs/idea.properties/ /
 
 # Create a folder structure for mounting a shared volume and copy the editor binaries.
 RUN mkdir -p /idea-server/status-app
@@ -41,7 +39,11 @@ RUN for f in "${HOME}" "/etc/passwd" "/etc/group" "/status-app" "/idea-server";
 WORKDIR /status-app/
 RUN npm install
 
-# to provide to a UBI8-based user's container
+# When registry.access.redhat.com/ubi9 is used as a user container,
+# there no libbrotli in the image. We provide it additionally to the user's container.
+RUN mkdir /node-ubi9-ld_libs && cp -r /usr/lib64/libbrotli* /node-ubi9-ld_libs/
+
+# To make the solution backward compatible with the UBI8-based user containers.
 COPY --from=ubi8 /usr/bin/node /node-ubi8
 
 # Switch to an unprivileged user.

build/jetbrains_configs/idea.properties

@@ -24,7 +24,7 @@ if [ -z "$ide_flavour" ]; then
 fi
 
 # Download the IDE binaries and install them to the shared volume.
-cd "$ide_server_path"
+cd "$ide_server_path" || exit
 echo "Downloading IDE binaries..."
 # After updating the versions here, update the editor definitions in https://github.com/eclipse-che/che-operator/tree/main/editors-definitions
 ide_download_url=""
@@ -63,13 +63,11 @@ curl -sL "$ide_download_url" | tar xzf - --strip-components=1
 cp -r /status-app/ "$ide_server_path"
 cp /entrypoint-volume.sh "$ide_server_path"
 
-# Copy the Che-specific JetBrains IDE's config to the volume.
-cp /idea.properties "$ide_server_path"
-
 # Copy Node.js binaries to the editor volume.
 # It will be copied to the user container if it's absent.
 cp /usr/bin/node "$ide_server_path"/node-ubi9
 cp /node-ubi8 "$ide_server_path"/node-ubi8
+cp -r /node-ubi9-ld_libs "$ide_server_path"/node-ubi9-ld_libs
 
 echo "Volume content:"
 ls -la "$ide_server_path"

build/scripts/entrypoint-init-container.sh

@@ -81,7 +81,7 @@ get_openssl_version() {
 
 # Start the app that checks the IDE server status.
 # This will be workspace's 'main' endpoint.
-cd "$ide_server_path"/status-app
+cd "$ide_server_path"/status-app || exit
 if command -v npm &> /dev/null; then
   # Node.js installed in a user's container
   nohup npm start &
@@ -97,6 +97,10 @@ else
     ;;
   *"3"*)
     mv "$ide_server_path"/node-ubi9 "$ide_server_path"/node
+
+    # When registry.access.redhat.com/ubi9 is used as a user container,
+    # there no libbrotli in the image. We provide it additionally.
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ide_server_path/node-ubi9-ld_libs"
     ;;
   *)
     echo "[WARNING] Unsupported OpenSSL major version. Node.js from UBI9 will be used."
@@ -107,8 +111,16 @@ else
   nohup "$ide_server_path"/node index.js &
 fi
 
-# Override the default JetBrains IDE's config by our own.
-mv "$ide_server_path"/idea.properties "${HOME}/idea.properties"
+cd "$ide_server_path"/bin || exit
+
+# remote-dev-server.sh writes to several sub-folders of HOME (.config, .cache, etc.)
+# When registry.access.redhat.com/ubi9 is used for running a user container, HOME=/ which is read-only.
+# In this case, we point remote-dev-server.sh to a writable HOME.
 
-cd "$ide_server_path"/bin
-./remote-dev-server.sh run ${PROJECT_SOURCE}
+if [ -w "$HOME" ]; then
+    ./remote-dev-server.sh run "$PROJECT_SOURCE"
+else
+    echo "No write permission to HOME=$HOME. IDE dev server will be launched with HOME=/tmp/user"
+    mkdir /tmp/user
+    env HOME=/tmp/user ./remote-dev-server.sh run "$PROJECT_SOURCE"
+fi