Merge pull request #598 from google:rto

PiperOrigin-RevId: 625724059

maxtext_dependencies.Dockerfile

@@ -2,11 +2,8 @@
 # Use Python 3.10 as the base image
 FROM python:3.10-slim-bullseye
 
-# Install system dependencies Git, and numactl
-RUN apt-get update && apt-get install -y curl gnupg git numactl
-
-# Install dependencies for adjusting network rto
-RUN apt-get update && apt-get install -y iproute2 ethtool lsof
+# Install system dependencies
+RUN apt-get update && apt-get install -y curl gnupg
 
 # Add the Google Cloud SDK package repository
 RUN 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

rto_setup.sh

@@ -5,13 +5,6 @@ set -e
 
 echo "Adjust Network settings and apply non cache copy"
 
-# Install ip.
-apt-get update
-yes | apt-get install net-tools
-yes | apt-get install iproute2
-yes | apt-get install procps
-yes | apt-get install ethtool
-
 # Disable slow start after idle
 sysctl net.ipv4.tcp_slow_start_after_idle=0
 

setup.sh

@@ -33,7 +33,13 @@ apt update && \
 apt install -y numactl && \
 apt install -y lsb-release && \
 apt install -y gnupg && \
-apt install -y curl
+apt install -y curl && \
+apt install -y net-tools && \
+apt install -y iproute2 && \
+apt install -y procps && \
+apt install -y lsof && \
+apt install -y git && \
+apt install -y ethtool
 export GCSFUSE_REPO=gcsfuse-`lsb_release -c -s`
 echo "deb https://packages.cloud.google.com/apt $GCSFUSE_REPO main" | tee /etc/apt/sources.list.d/gcsfuse.list
 curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -