[test] Add back one more of the patches of bbockelm

CoffeaTeam · Dec 1, 2023 · c533e61 · c533e61
1 parent 1928087
commit c533e61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker/Dockerfile.cc-analysis-ubuntu b/docker/Dockerfile.cc-analysis-ubuntu
@@ -174,7 +174,7 @@ RUN groupadd -r condor && \
 # Distributed: we need to install patched version of distributed version
 COPY dask/distributed /opt/conda/lib/python3.9/site-packages/distributed
 RUN cd /opt/conda/lib/python3.9/site-packages/distributed && \
-    # patch -p2 < 0001-Patch-from-bbockelman-adaptive-scaling.patch && \
+    patch -p2 < 0001-Patch-from-bbockelman-adaptive-scaling.patch && \
     patch -p2 < 0002-Allow-scheduler-to-preserve-worker-hostnames.patch
     # && patch -p2 < 0003-Activate-patch.patch
     # && patch -p2 < 0004-Add-possibility-to-setup-external_adress-for-schedul.patch

diff --git a/docker/Dockerfile.cc-base-ubuntu b/docker/Dockerfile.cc-base-ubuntu
@@ -321,7 +321,7 @@ USER root
 # Distributed: we need to install patched version of distributed version
 COPY dask/distributed ${CONDA_DIR}/lib/python3.9/site-packages/distributed
 RUN cd ${CONDA_DIR}/lib/python3.9/site-packages/distributed && \
-    # patch -p2 < 0001-Patch-from-bbockelman-adaptive-scaling.patch && \
+    patch -p2 < 0001-Patch-from-bbockelman-adaptive-scaling.patch && \
     patch -p2 < 0002-Allow-scheduler-to-preserve-worker-hostnames.patch
     # && patch -p2 < 0003-Activate-patch.patch
     # && patch -p2 < 0004-Add-possibility-to-setup-external_adress-for-schedul.patch