From f84dccf98f3c953d46a1125f8528df5a4cb19e56 Mon Sep 17 00:00:00 2001
From: Michael Lim <michael.lim@day8.com.au>
Date: Thu, 28 Mar 2024 04:58:23 +0800
Subject: [PATCH] Update Dockerfile

---
 .devcontainer/Dockerfile | 58 +++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4f0316ea..43b5b25e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -20,6 +20,7 @@ ARG POLYLITH_VERSION="0.2.13-alpha"
 
 ARG INSTALL_CLOJURE_CLI="true"
 ARG INSTALL_LEININGEN="true"
+ARG INSTALL_POLYLITH="true"
 
 # # [Option] Install Clojure CLI tool
 # ARG INSTALL_CLOJURE_CLI="${templateOption:installClojureCli}"
@@ -45,31 +46,32 @@ RUN if [ "${INSTALL_LEININGEN}" = "true" ]; then \
     && chmod +x lein \
     && mv lein /usr/local/sbin; fi
 
-# # Cache Clojure and dependencies
-# RUN if [ "${INSTALL_LEININGEN}" = "true" ]; then \
-#     su vscode -c " cd ~ \
-#     && echo '(defproject dummy \"\" :dependencies [[org.clojure/clojure \"'${CLOJURE_VERSION}'\"]])' > project.clj \
-#     && lein deps \
-#     && rm project.clj"; fi
-
-# RUN if [ "${INSTALL_POLYLITH}" = "true" ]; then \
-#     curl -OL "https://github.com/polyfy/polylith/releases/download/v${POLYLITH_VERSION}/poly-${POLYLITH_VERSION}.jar" \
-#     && mkdir -p /usr/local/polylith \
-#     && mv poly-$POLYLITH_VERSION.jar /usr/local/polylith \
-#     && echo '#!/bin/sh\nARGS=""\nwhile [ "$1" != "" ] ; do\n  ARGS="$ARGS $1"\n  shift\ndone\nexec "java" $JVM_OPTS "-jar" "/usr/local/polylith/poly-'$POLYLITH_VERSION'.jar" $ARGS\n' > /usr/local/sbin/poly \
-#     && chmod +x /usr/local/sbin/poly \
-#     && /usr/local/sbin/poly version; fi
-
-# # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-# ARG NODE_VERSION="${templateOption:nodeVersion}"
-# RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# # [Optional] Uncomment this section to install additional OS packages.
-# # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-# #     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# # [Optional] Uncomment this line to install global node packages.
-# # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
-
-# # Clean up package lists
-# RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+# Cache Clojure and dependencies
+RUN if [ "${INSTALL_LEININGEN}" = "true" ]; then \
+    su vscode -c " cd ~ \
+    && echo '(defproject dummy \"\" :dependencies [[org.clojure/clojure \"'${CLOJURE_VERSION}'\"]])' > project.clj \
+    && lein deps \
+    && rm project.clj"; fi
+
+RUN if [ "${INSTALL_POLYLITH}" = "true" ]; then \
+    curl -OL "https://github.com/polyfy/polylith/releases/download/v${POLYLITH_VERSION}/poly-${POLYLITH_VERSION}.jar" \
+    && mkdir -p /usr/local/polylith \
+    && mv poly-$POLYLITH_VERSION.jar /usr/local/polylith \
+    && echo '#!/bin/sh\nARGS=""\nwhile [ "$1" != "" ] ; do\n  ARGS="$ARGS $1"\n  shift\ndone\nexec "java" $JVM_OPTS "-jar" "/usr/local/polylith/poly-'$POLYLITH_VERSION'.jar" $ARGS\n' > /usr/local/sbin/poly \
+    && chmod +x /usr/local/sbin/poly \
+    && /usr/local/sbin/poly version; fi
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+#ARG NODE_VERSION="${templateOption:nodeVersion}"
+ARG NODE_VERSION="16"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+
+# Clean up package lists
+RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*