Devcontainer now builds R directly in the Docker image

PRL-PRG · Jan 22, 2025 · f57dd0c · f57dd0c
1 parent b48e481
commit f57dd0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -70,6 +70,6 @@ RUN curl -fsSL -o /opt/llvm.sh https://apt.llvm.org/llvm.sh \
   && /opt/llvm.sh "$LLVM_VERSION"
 
 # Install R
-COPY ./build-gnur.sh /workspace/tools/build-gnur.sh
-RUN mkdir -p /workspace/external
-RUN cd /workspace/external ; bash ../tools/build-gnur.sh
+COPY ./build-gnur-in-docker.sh /workspace/tools/build-gnur-in-docker.sh
+RUN mkdir -p /workspace/external/R
+RUN cd /workspace/external ; bash ../tools/build-gnur-in-docker.sh R
diff --git a/.devcontainer/build-gnur.sh → .devcontainer/build-gnur-in-docker.sh b/.devcontainer/build-gnur.sh → .devcontainer/build-gnur-in-docker.sh
@@ -55,8 +55,11 @@ else
 fi
 
 if [[ ! -f ${R_DIR}/.git ]]; then
-  echo "-> update submodules"
-  git submodule update --init
+  # We don't use the submodule here because that version 
+  # of the  script is used when building the Docker image
+  echo "-> fetch modified R sources"
+  git clone https://github.com/PRL-PRG/r-compiler-server-gnur
+  mv r-compiler-server-gnur "$R_DIR"
 fi
 
 function build {
@@ -67,6 +70,7 @@ function build {
     sleep 1
   fi
 
+
   tools/rsync-recommended
 
   if [[ ! -f Makefile ]]; then