Merge pull request #71 from mikesir87/add-workspace-variants

Add workspace variants

Author: mikesir87

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+.vite

components/workspace/.dockerignore

@@ -8,34 +8,30 @@ RUN mkdir -p ~/.docker/cli-plugins && chown -R 1000:1000 ~/.docker
 COPY --link --from=docker /usr/local/bin/docker /usr/local/bin/docker
 COPY --link --chown=1000:1000 --from=docker /usr/local/libexec/docker/cli-plugins /home/coder/.docker/cli-plugins
 COPY --link --chown=1000:1000 --from=docker/scout-cli:1.18 /docker-scout /home/coder/.docker/cli-plugins/docker-scout
-COPY --link --chown=1000:1000 --from=docker/docker-model-cli-desktop-module:v0.1.36 /cli-plugins/model/linux/docker-model /home/coder/.docker/cli-plugins/docker-model
+COPY --link --chown=1000:1000 --from=docker/docker-model-cli-desktop-module:v0.1.40 /cli-plugins/model/linux/docker-model /home/coder/.docker/cli-plugins/docker-model
 
 USER root
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x -o /tmp/nodesource_setup.sh && \
-    bash /tmp/nodesource_setup.sh && \
-    apt-get install -y nodejs && \
-    rm /tmp/nodesource_setup.sh && \
-    rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /home/coder/.config/code-server && \
     mkdir -p /home/coder/.local/share/code-server && \
     mkdir -p /home/coder/.npm && \
     chown -R 1000:1000 /home/coder
 
 RUN apt update && \
-    apt install -y socat && \
+    apt install -y jq && \
     rm -rf /var/lib/apt/lists/*
 
-RUN apt update && \
-    apt install -y postgresql-client jq && \
-    rm -rf /var/lib/apt/lists/*
 
 USER 1000
-RUN code-server --install-extension orta.vscode-jest && \
-    code-server --install-extension ms-azuretools.vscode-docker && \
+RUN code-server --install-extension ms-azuretools.vscode-docker && \
     code-server --install-extension github.vscode-github-actions && \
-    code-server --install-extension docker.docker
-RUN --mount=from=extension,target=/extension code-server --install-extension /extension/support-extension.vsix
+    code-server --install-extension docker.docker && \
+    rm -rf /home/coder/.local/share/code-server/CachedExtensionVSIXs/.trash/*
+
+RUN --mount=from=extension,target=/extension \
+    code-server --install-extension /extension/support-extension.vsix && \
+    rm -rf /home/coder/.local/share/code-server/CachedExtensionVSIXs/.trash/*
+
 COPY --chown=1000:1000 ./config.yaml /home/coder/.config/code-server/config.yaml
 COPY --chown=1000:1000 ./settings.json /home/coder/.local/share/code-server/User/settings.json
 

components/workspace/Dockerfile renamed to components/workspace/base/Dockerfile

@@ -0,0 +1,8 @@
+{
+    "remote.autoForwardPorts": false,
+    "security.workspace.trust.enabled": false,
+    "window.autoDetectColorScheme": true,
+    "terminal.integrated.env.linux": {
+        "PATH": "${env:PATH}"
+    }
+}

components/workspace/config.yaml renamed to components/workspace/base/config.yaml

@@ -0,0 +1,41 @@
+FROM labspace-workspace-base
+
+USER root
+
+# Install and setup Java (pulling from the eclipse-temurin image and Dockerfile)
+ENV JAVA_HOME=/opt/java/openjdk
+ENV PATH=$JAVA_HOME/bin:$PATH
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+RUN set -eux; \
+    apt-get update; \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        fontconfig \
+        ca-certificates p11-kit \
+        binutils \
+        tzdata \
+        locales \
+    ; \
+    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
+    locale-gen en_US.UTF-8; \
+    rm -rf /var/lib/apt/lists/*
+COPY --from=eclipse-temurin:21-jdk /opt/java/openjdk /opt/java/openjdk
+RUN find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
+    ldconfig; \
+    java -Xshare:dump;
+
+RUN set -eux; \
+    echo "Verifying install ..."; \
+    fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
+    echo "javac --version"; javac --version; \
+    echo "java --version"; java --version; \
+    echo "Complete."
+
+# Setup Maven
+ENV MAVEN_HOME=/usr/share/maven
+COPY --from=maven:3.9.11-eclipse-temurin-21 ${MAVEN_HOME} ${MAVEN_HOME}
+RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+
+
+USER 1000
+RUN code-server --install-extension vscjava.vscode-java-pack && \
+    rm -rf /home/coder/.local/share/code-server/CachedExtensionVSIXs/.trash/*

components/workspace/base/settings.json

@@ -0,0 +1,19 @@
+FROM labspace-workspace-base
+
+USER root
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x -o /tmp/nodesource_setup.sh && \
+    bash /tmp/nodesource_setup.sh && \
+    apt-get install -y nodejs && \
+    rm /tmp/nodesource_setup.sh && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /home/coder/.npm && \
+    chown -R 1000:1000 /home/coder/.npm
+
+RUN apt update && \
+    apt install -y postgresql-client jq && \
+    rm -rf /var/lib/apt/lists/*
+
+USER 1000
+RUN code-server --install-extension orta.vscode-jest && \
+    rm -rf /home/coder/.local/share/code-server/CachedExtensionVSIXs/.trash/*

components/workspace/java/Dockerfile

@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
 
   workspace:
-    image: dockersamples/labspace-workspace:latest
+    image: dockersamples/labspace-workspace-node:latest
     depends_on:
       configurator:
         condition: service_completed_successfully

components/workspace/node/Dockerfile

@@ -37,7 +37,7 @@ services:
     restart: unless-stopped
 
   workspace:
-    image: dockersamples/labspace-workspace:latest
+    image: dockersamples/labspace-workspace-node:latest
     depends_on:
       configurator:
         condition: service_completed_successfully