Updating extensions

jpwhite3 · Nov 7, 2023 · 32cf462 · 32cf462
1 parent 1652c92
commit 32cf462
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 30 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,20 +8,23 @@ RUN \
 	&& curl -fOL https://github.com/cdr/code-server/releases/download/v${CODER_VERSION}/code-server_${CODER_VERSION}_amd64.deb \
 	&& sudo dpkg -i code-server_${CODER_VERSION}_amd64.deb
 
-# Fetch VSCode extensions
-ENV VSCODE_DOTNET_RUNTIME_VERSION 1.8.0
-ENV VSCODE_CSHARP_VERSION 2.5.30
+
+# Download & install cached VSCode extensions
+ENV VSCODE_DOTNET_RUNTIME_VERSION 2.0.0
+ENV VSCODE_CSHARP_VERSION 2.9.20
 ENV VSCODE_INTELLICODE 1.2.30
 ENV VSCODE_INTELLICODE_CSHARP 0.1.26
-ENV VSCODE_CSHARP_DEV_KIT 0.5.150
-ENV REDHAT_JAVA 1.24.2023100504
-ENV VSCODE_JAVA_DEBUG 0.54.2023092623
-ENV VSCODE_JAVA_TEST 0.40.0
-ENV VSCODE_MAVEN 0.42.2023092603
-ENV VSCODE_JAVA_DEP 0.23.2023080400
-ENV VSCODE_JAVA_PACK 0.25.2023092206
-ENV VSCODE_PYTHON 2023.19.12781014
-ENV VSCODE_PYLANCE 2023.19.12781014
+ENV VSCODE_CSHARP_DEV_KIT 1.1.5
+ENV REDHAT_JAVA 1.25.2023110703
+ENV VSCODE_JAVA_DEBUG 0.55.0
+ENV VSCODE_JAVA_TEST 0.40.2023101002
+ENV VSCODE_MAVEN 0.43.0
+ENV VSCODE_JAVA_DEP 0.23.2023100802
+ENV VSCODE_JAVA_PACK 0.25.2023100708
+ENV VSCODE_PYTHON 2023.21.13101009
+ENV VSCODE_PYLANCE 2023.11.11
+ENV VSCODE_RUST_SYNTAX 0.6.1
+ENV VSCODE_RUST_ANALYZER 0.4.1723
 RUN \
 	curl -o /tmp/vscode-dotnet-runtime-${VSCODE_DOTNET_RUNTIME_VERSION}.vsix -fL https://coder-extensions.s3.amazonaws.com/ms-dotnettools.vscode-dotnet-runtime-${VSCODE_DOTNET_RUNTIME_VERSION}.vsix \
 	&& curl -o /tmp/csharp-${VSCODE_CSHARP_VERSION}.vsix -fL https://coder-extensions.s3.amazonaws.com/ms-dotnettools.csharp-${VSCODE_CSHARP_VERSION}%40linux-x64.vsix \
@@ -35,26 +38,14 @@ RUN \
 	&& curl -o /tmp/vscode-java-dependency-${VSCODE_JAVA_DEP}.vsix -fL https://coder-extensions.s3.amazonaws.com/vscjava.vscode-java-dependency-${VSCODE_JAVA_DEP}.vsix \
 	&& curl -o /tmp/vscode-java-pack-${VSCODE_JAVA_PACK}.vsix -fL https://coder-extensions.s3.amazonaws.com/vscjava.vscode-java-pack-${VSCODE_JAVA_PACK}.vsix \
 	&& curl -o /tmp/vscode-python-${VSCODE_PYTHON}.vsix -fL https://coder-extensions.s3.amazonaws.com/ms-python.python-${VSCODE_PYTHON}.vsix \
-	&& curl -o /tmp/vscode-pylance-${VSCODE_PYLANCE}.vsix-fL https://coder-extensions.s3.amazonaws.com/ms-python.vscode-pylance-${VSCODE_PYLANCE}.vsix
-
-RUN \
-	code-server --verbose --install-extension /tmp/vscode-dotnet-runtime-${VSCODE_DOTNET_RUNTIME_VERSION}.vsix \
-	&& code-server --verbose --install-extension /tmp/csharp-${VSCODE_CSHARP_VERSION}.vsix \
-	&& code-server --verbose --install-extension /tmp/intellicode-${VSCODE_INTELLICODE}.vsix \
-	&& code-server --verbose --install-extension /tmp/intellicode-csharp-${VSCODE_INTELLICODE_CSHARP}.vsix \
-	&& code-server --verbose --install-extension /tmp/csharp-dev-kit-${VSCODE_CSHARP_DEV_KIT}.vsix \
-	&& code-server --verbose --install-extension /tmp/redhat-java-${REDHAT_JAVA}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-java-debug-${VSCODE_JAVA_DEBUG}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-java-test-${VSCODE_JAVA_TEST}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-maven-${VSCODE_MAVEN}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-java-dependency-${VSCODE_JAVA_DEP}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-java-pack-${VSCODE_JAVA_PACK}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-python-${VSCODE_PYTHON}.vsix \
-	&& code-server --verbose --install-extension /tmp/vscode-python-${VSCODE_PYLANCE}.vsix \
+	&& curl -o /tmp/vscode-pylance-${VSCODE_PYLANCE}.vsix-fL https://coder-extensions.s3.amazonaws.com/ms-python.vscode-pylance-${VSCODE_PYLANCE}.vsix \
+	&& curl -o /tmp/rust-syntax-${VSCODE_RUST_SYNTAX}.vsix-fL https://coder-extensions.s3.amazonaws.com/dustypomerleau.rust-syntax-${VSCODE_RUST_SYNTAX}.vsix.vsix \
+	&& curl -o /tmp/rust-analyzer-${VSCODE_RUST_ANALYZER}.vsix-fL https://coder-extensions.s3.amazonaws.com/rust-lang.rust-analyzer-${VSCODE_RUST_ANALYZER}@linux-x64.vsix \
+	&& find /tmp/ -name '*.vsix' -exec code-server --verbose --install-extension {} \; \
 	&& rm -rf /tmp/vscode*
 
 
-# Install VSCode extentions
+# Install VSCode extentions from coder marketplace
 RUN \
 	code-server --install-extension eamodio.gitlens \
 	&& code-server --install-extension mhutchie.git-graph \
@@ -70,6 +61,8 @@ RUN \
 	&& code-server --install-extension alexkrechik.cucumberautocomplete \
 	&& rm -rf /root/.local/share/code-server/CachedExtensionVSIXs/*
 
+
+# Install local scripts
 COPY scripts/lvlup-git-setup /usr/bin/lvlup-git-setup
 COPY scripts/lvlup-git-sync /usr/bin/lvlup-git-sync
 COPY scripts/lvlup-git-reset /usr/bin/lvlup-git-reset
@@ -78,8 +71,10 @@ RUN \
 	&& chmod +x /usr/bin/lvlup-git-sync \
 	&& chmod +x /usr/bin/lvlup-git-reset
 
+
 # ports and volumes
 EXPOSE 9000 9001
 
+
 # Set entrypoint
 ENTRYPOINT ["code-server", "--bind-addr", "0.0.0.0:9000", "--user-data-dir", "/config/data", "--extensions-dir", "/root/.local/share/code-server/extensions", "--disable-telemetry", "--auth", "none", "/config/workspace"]
diff --git a/scripts/lvlup-git-reset b/scripts/lvlup-git-reset
@@ -21,7 +21,7 @@ commands = [
     "git checkout main",
     "git fetch origin",
     "git reset origin/main --hard",
-    "git clean -fdx",
+    "git clean -ffdx",
     "git pull",
 ]
 for cmd in commands: