Merge pull request #4379 from vikramvs-gg/workstation_image

Changes to Dockerfile for updating workstation image

Author: vikramvs-gg

tools/cloud-workstations/Dockerfile

@@ -16,39 +16,54 @@
 FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/code-oss:latest
 
 ARG TFLINT_VERSION
-# Need to get shellcheck directly as the on the repo is outdated and causes failures
 ARG SHELLCHECK_VER=v0.9.0
 
-RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -  && \
-    apt-get -y update && apt-get -y install \
+# --- Install Base Utilities and Tools ---
+RUN apt-get -y update && apt-get -y install \
     software-properties-common \
     keychain \
-    dnsutils && \
-    apt-add-repository "deb [arch=$(dpkg --print-architecture)] https://apt.releases.hashicorp.com bullseye main" && \
-    apt-get -y update && apt-get install -y unzip python3-pip python3-venv terraform packer jq tmux && \
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" \
-      | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg \
-      | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
-    apt-get -y update && apt-get -y install google-cloud-sdk && \
+    dnsutils \
+    curl \
+    gnupg \
+    lsb-release \
+    unzip \
+    jq \
+    tmux && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN wget https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-$SHELLCHECK_VER.linux.x86_64.tar.xz && \
-    tar xvf shellcheck-$SHELLCHECK_VER.linux.x86_64.tar.xz && \
-    mv shellcheck-$SHELLCHECK_VER/shellcheck /bin/shellcheck
+# --- Install ShellCheck ---
+RUN wget https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VER}/shellcheck-${SHELLCHECK_VER}.linux.x86_64.tar.xz && \
+    tar xvf shellcheck-${SHELLCHECK_VER}.linux.x86_64.tar.xz && \
+    mv shellcheck-${SHELLCHECK_VER}/shellcheck /usr/local/bin/shellcheck && \
+    rm -rf shellcheck-*
 
+# --- Install TFLint ---
 RUN curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
 
-COPY tools/cloud-build/requirements.txt cloud_build_requirements.txt
-COPY docs/hybrid-slurm-cluster/requirements.txt slurm_requirements.txt
+# --- Add HashiCorp Repo and Install Terraform/Packer ---
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg arch=$(dpkg --print-architecture)] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/hashicorp.list && \
+    apt-get -y update && apt-get install -y \
+    terraform \
+    packer && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r https://raw.githubusercontent.com/SchedMD/slurm-gcp/master/scripts/requirements.txt && \
-    pip install --no-cache-dir -r cloud_build_requirements.txt && \
-    pip install --no-cache-dir -r slurm_requirements.txt && \
-    rm -rf ~/.cache/pip/*
+# --- Install Python and Set as Default ---
+RUN add-apt-repository ppa:deadsnakes/ppa && \
+    apt-get -y update && \
+    apt-get -y install \
+        python3.10 \
+        python3.10-venv \
+        python3.10-dev \
+        python3-pip && \
+    update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# --- Create Virtual Environment ---
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
-# Get the HPC config files and store them in the correct locations for startup
+# --- Copy configuration files ---
 ARG CW_DIR=tools/cloud-workstations
 ARG HPC_WORK_FILE=200_configure-hpc-toolkit.sh
 ARG HPC_CONF_FILE=configure-hpc-toolkit.sh
@@ -65,3 +80,13 @@ RUN chmod a+rx $START_DIR/$HPC_WORK_FILE
 
 COPY $CW_DIR/$CODE_REQS $HPC_CONFIG_DIR/$CODE_REQS
 RUN chmod a+r $HPC_CONFIG_DIR/$CODE_REQS
+
+COPY tools/cloud-build/requirements.txt cloud_build_requirements.txt
+COPY docs/hybrid-slurm-cluster/requirements.txt slurm_requirements.txt
+
+# --- Install Python Dependencies ---
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
+    pip install --no-cache-dir --prefer-binary --no-build-isolation -r https://raw.githubusercontent.com/SchedMD/slurm-gcp/master/scripts/requirements.txt && \
+    pip install --no-cache-dir --prefer-binary --no-build-isolation -r cloud_build_requirements.txt && \
+    pip install --no-cache-dir --prefer-binary --no-build-isolation -r slurm_requirements.txt && \
+    rm -rf ~/.cache/pip/*