Merge pull request #235 from StarTrooper08/update/dynamic-url

* Use Ubuntu latest
* Use linux binaries from R-universe for languageserver and httpgd package
* Fallback to developer website fro httpgd as no longer on CRAN

Author: hturner

Dockerfile

@@ -1,28 +1,29 @@
-FROM mcr.microsoft.com/devcontainers/cpp:dev-ubuntu-22.04
-
-ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="none"
-
-# Optionally install the cmake for vcpkg
-COPY ./reinstall-cmake.sh /tmp/
-
-RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
-    chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
-    fi \
-    && rm -f /tmp/reinstall-cmake.sh
-
-# software-properties-common installed for apt-add-repository
-RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
-    && apt -y update \
-    && apt install -y --no-install-recommends \
-      software-properties-common \
-      subversion \
-    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
-    && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
-    && apt -y build-dep r-base-dev \
-    && apt -y install r-base-dev \
-    && Rscript -e "install.packages(c('languageserver', 'httpgd'), \
-    repos = c(CRAN='https://cloud.r-project.org'))" \
-    && rm -rf /var/lib/apt/lists/*
-
-ARG CONTAINER_VERSION
-ENV CONTAINER_VERSION ${CONTAINER_VERSION}
+FROM mcr.microsoft.com/devcontainers/cpp:dev-ubuntu
+
+# Update and install necessary dependencies
+# (software-properties-common installed for apt-add-repository)
+RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+      software-properties-common \
+      subversion \
+    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
+    && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
+    && apt-get update \
+    && apt-get build-dep r-base-dev \
+    && apt-get install -y r-base-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install R packages, with dynamic r-universe URL
+RUN Rscript -e "runiverse <- sprintf('r-universe.dev/bin/linux/%s-%s/%s/', \
+                                 system2('lsb_release', '-sc', stdout = TRUE), \
+                                 R.version\$arch, \
+                                 substr(getRversion(), 1, 3)); \
+                print('Installing packages...'); \
+                install.packages(c('languageserver', 'httpgd'), \
+                 repos = c(runiverse = paste0('https://cran.', runiverse), \
+                           nx10 = paste0('https://nx10.', runiverse))); \
+                print('Packages installed.')"
+
+ARG CONTAINER_VERSION
+ENV CONTAINER_VERSION=${CONTAINER_VERSION}