1+ <<<<<<< HEAD
2+ # Use Python 3.12-slim-bullseye as the base image
3+ FROM python:3.12-slim-bullseye
4+ =======
15# Use Python 3.12-slim-bullseye as the base image unless overridden
26ARG BASEIMAGE=python:3.12-slim-bullseye
37FROM $BASEIMAGE
8+ >>>>>>> origin/main
49
510# Environment variable for no-cache-dir and pip root user warning
611ENV PIP_NO_CACHE_DIR=1
@@ -13,8 +18,13 @@ ENV CLOUD_SDK_VERSION=latest
1318# Set DEBIAN_FRONTEND to noninteractive to avoid frontend errors
1419ENV DEBIAN_FRONTEND=noninteractive
1520
21+ <<<<<<< HEAD
22+ # Upgrade pip to the latest version
23+ RUN python -m pip install --upgrade pip --no-warn-script-location
24+ =======
1625# Upgrade pip to the latest version and install uv
1726RUN python -m pip install --upgrade pip uv --no-warn-script-location
27+ >>>>>>> origin/main
1828
1929# Install system dependencies
2030RUN apt-get update && apt-get install -y apt-utils git curl gnupg procps iproute2 ethtool && rm -rf /var/lib/apt/lists/*
@@ -26,12 +36,26 @@ RUN curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dea
2636# Install the Google Cloud SDK
2737RUN apt-get update && apt-get install -y google-cloud-sdk && rm -rf /var/lib/apt/lists/*
2838
39+ <<<<<<< HEAD
40+ # Install cloud-accelerator-diagnostics
41+ RUN pip install cloud-accelerator-diagnostics
42+
43+ # Install cloud-tpu-diagnostics
44+ RUN pip install cloud-tpu-diagnostics
45+
46+ # Install gcsfs
47+ RUN pip install gcsfs
48+
49+ # Install google-cloud-storage
50+ RUN pip install google-cloud-storage
51+ =======
2952# Install diagnostic and storage dependencies using uv
3053RUN python -m uv pip install --system \
3154 cloud-accelerator-diagnostics \
3255 cloud-tpu-diagnostics \
3356 gcsfs \
3457 google-cloud-storage
58+ >>>>>>> origin/main
3559
3660# Args
3761ARG MODE
0 commit comments