Add Ocaml Lang features

ls1intum · Sep 21, 2024 · c49404f · c49404f
1 parent b693133
commit c49404f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/images/README.md b/images/README.md
@@ -14,7 +14,7 @@ Matching Artemis' programming environments, the following images are available:
 | VHDL      | ❌        |        ❌        |
 | Assembler | ❌        |        ❌        |
 | Swift     | ✔️         |        ✔️         |
-| Ocaml     | ✔️         |        ❌        |
+| Ocaml     | ✔️         |        ✔️         |
 | Javascript| ✔️         |        ✔️         |
 | Rust      | ✔️         |        ✔️         |
 

diff --git a/images/ocaml/ToolDockerfile b/images/ocaml/ToolDockerfile
@@ -57,24 +57,26 @@ COPY --from=base-ide --chown=theia:theia /home/theia/project /home/project
 
 # Install required tools for tool creation and terminal usage: wget, apt-transport-https, update & upgrade packages, bash
 RUN apt-get update && \
-    apt-get install -y wget apt-transport-https bash && \
-    apt-get upgrade -y
+    apt-get install -y wget apt-transport-https bash curl m4 tzdata
 
-# Install Ocaml dependencies
-RUN apt-get install opam -y && \
-    apt-get install -y m4 && \
-    apt-get install -y tzdata && \
-    opam init --disable-sandboxing -y && \
-    opam install qcheck ocaml-lsp-server odoc ocamlformat utop -y
+# Install opam and ocaml dependencies
+RUN apt-get install -y opam
 
-# Create .ocamlformat file inside project's root directory for ocamlformat to work
-RUN touch /home/project/.ocamlformat
+# Set up non-root user early to avoid root permission issues with opam
+USER theia
+ENV HOME /home/theia
 
-# Make user theia own the .opam directory
-# RUN chown -R theia:theia /home/theia/.opam
+# Initialize opam environment for the non-root user (theia)
+RUN opam init --disable-sandboxing -y && \
+    eval $(opam env) && \
+    opam install dune.3.15.3 -y && \
+    opam install qcheck ocaml-lsp-server odoc ocamlformat utop user-setup -y
 
-# Opam needs to be initailized for theia user in every terminal session
-# RUN echo "eval $(opam env)" >> /home/node/.bashrc
+# Ensure the OPAM environment is loaded for future shell sessions
+RUN echo "eval \$(opam env)" >> /home/theia/.bashrc
+
+# Create .ocamlformat file inside project's root directory for ocamlformat to work
+RUN touch /home/project/.ocamlformat
 
 # Specify default shell for Theia and the Built-In plugins directory
 ENV SHELL=/bin/bash \
@@ -85,8 +87,6 @@ ENV USE_LOCAL_GIT true
 
 EXPOSE 3000
 
-# Switch to Theia user
-USER theia
 WORKDIR /home/theia/applications/browser
 
 # Launch the backend application via node