Update code-server.

5 files changed, 27 insertions, 8 deletions

diff --git a/docker/code-server/Dockerfile b/docker/code-server/Dockerfile
index 9dd5413..6794935 100644
--- a/docker/code-server/Dockerfile
+++ b/docker/code-server/Dockerfile
@@ -6,7 +6,7 @@ ENV GIT_NAME=$GIT_NAME
 ENV GIT_EMAIL=$GIT_EMAIL
 
 WORKDIR /scripts
-COPY install-code-server.bash install-dev-tools.bash /scripts/
+COPY *.bash /scripts/
 RUN /scripts/install-code-server.bash && /scripts/install-dev-tools.bash && rm -r /scripts
 
 ENV LANG en_US.utf8
diff --git a/docker/code-server/install-cmake.bash b/docker/code-server/install-cmake.bash
new file mode 100644
index 0000000..7b74ba8
--- /dev/null
+++ b/docker/code-server/install-cmake.bash
@@ -0,0 +1,5 @@
+CMAKE_VERSION=$(curl -s https://api.github.com/repos/Kitware/CMake/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
+wget -O cmake-installer.sh https://github.com/Kitware/CMake/releases/download/v"$CMAKE_VERSION"/cmake-"$CMAKE_VERSION"-linux-x86_64.sh
+chmod +x cmake-installer.sh
+./cmake-installer.sh --skip-license --prefix=/usr
+rm cmake-installer.sh
diff --git a/docker/code-server/install-dev-tools.bash b/docker/code-server/install-dev-tools.bash
index c1764ca..0358f9b 100755
--- a/docker/code-server/install-dev-tools.bash
+++ b/docker/code-server/install-dev-tools.bash
@@ -3,16 +3,14 @@
 set -e
 
 apt-get update
-apt-get install -y vim wget git
+apt-get install -y vim lsb-release wget git software-properties-common gnupg
+apt-get install -y gcc g++ make gdb
 
 git config --global user.email "$GIT_EMAIL"
 git config --global user.name "$GIT_NAME"
 
-wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-dpkg -i packages-microsoft-prod.deb
-rm packages-microsoft-prod.deb
-
-apt-get update
-apt-get install -y dotnet-sdk-7.0
+source ./install-llvm.bash
+source ./install-cmake.bash
+source ./install-dotnet.bash
 
 rm -rf /var/lib/apt/lists/*
diff --git a/docker/code-server/install-dotnet.bash b/docker/code-server/install-dotnet.bash
new file mode 100644
index 0000000..5e437ff
--- /dev/null
+++ b/docker/code-server/install-dotnet.bash
@@ -0,0 +1,6 @@
+wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+dpkg -i packages-microsoft-prod.deb
+rm packages-microsoft-prod.deb
+
+apt-get update
+apt-get install -y dotnet-sdk-7.0
diff --git a/docker/code-server/install-llvm.bash b/docker/code-server/install-llvm.bash
new file mode 100644
index 0000000..2ce798f
--- /dev/null
+++ b/docker/code-server/install-llvm.bash
@@ -0,0 +1,10 @@
+LLVM_VERSION=15
+wget https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+./llvm.sh $LLVM_VERSION all
+rm llvm.sh
+update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$LLVM_VERSION 100 \
+    --slave /usr/bin/clang++ clang++ /usr/bin/clang++-$LLVM_VERSION \
+    --slave /usr/bin/clangd clangd /usr/bin/clangd-$LLVM_VERSION \
+    --slave /usr/bin/lldb lldb /usr/bin/lldb-$LLVM_VERSION \
+    --slave /usr/bin/lld lld /usr/bin/lld-$LLVM_VERSION