From cb3a31c0a2978d4b6040ad5c03c5032fbb18e8af Mon Sep 17 00:00:00 2001
From: Dustin H <herbison@google.com>
Date: Fri, 10 Nov 2023 13:39:35 -0500
Subject: [PATCH 1/4] upgrade pyarrow

http://b/310037300
---
 Dockerfile.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index ece2998d..036cbfa7 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -240,8 +240,7 @@ RUN apt-get install -y libfreetype6-dev && \
         scikit-image && \
     /tmp/clean-layer.sh
 
-RUN pip install ibis-framework && \
-    pip install opencv-contrib-python opencv-python && \
+RUN pip install opencv-contrib-python opencv-python && \
     /tmp/clean-layer.sh
 
 RUN pip install scipy \
@@ -481,7 +480,8 @@ RUN pip install bleach \
         wcwidth \
         webencodings \
         widgetsnbextension \
-        pyarrow \
+        # Require pyarrow newer than https://github.com/advisories/GHSA-5wvp-7f3h-6wmm
+        "pyarrow>14.0.1" \
         feather-format \
         fastai
 

From 60c13b45a5448a593d98bb9a1598cf8038ab62b5 Mon Sep 17 00:00:00 2001
From: Dustin H <herbison@google.com>
Date: Fri, 10 Nov 2023 14:05:29 -0500
Subject: [PATCH 2/4] pyarrow>=14.0.1

---
 Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 036cbfa7..b7451187 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -481,7 +481,7 @@ RUN pip install bleach \
         webencodings \
         widgetsnbextension \
         # Require pyarrow newer than https://github.com/advisories/GHSA-5wvp-7f3h-6wmm
-        "pyarrow>14.0.1" \
+        "pyarrow>=14.0.1" \
         feather-format \
         fastai
 

From 496c39441926406cc738d741735171004893f6ac Mon Sep 17 00:00:00 2001
From: Dustin H <herbison@google.com>
Date: Fri, 10 Nov 2023 15:06:50 -0500
Subject: [PATCH 3/4] Require cudf and pyarrow to be consistent

---
 Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index b7451187..824a75f0 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -114,7 +114,7 @@ RUN pip install spacy && \
 
 # b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version.
 RUN pip uninstall -y pyarrow && \
-    mamba install -y cudf cuml && \
+    mamba install -y "pyarrow>=14.0.1" cudf cuml && \
     /tmp/clean-layer.sh
 
 # TODO: b/296444923 - Resolve pandas dependency another way

From 492257c3ddd3edca6019aa33664166a73027f77f Mon Sep 17 00:00:00 2001
From: Dustin H <herbison@google.com>
Date: Fri, 10 Nov 2023 16:17:59 -0500
Subject: [PATCH 4/4] Only upgrade pyarrow on CPU image

---
 Dockerfile.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 824a75f0..46ba785b 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -114,7 +114,7 @@ RUN pip install spacy && \
 
 # b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version.
 RUN pip uninstall -y pyarrow && \
-    mamba install -y "pyarrow>=14.0.1" cudf cuml && \
+    mamba install -y cudf cuml && \
     /tmp/clean-layer.sh
 
 # TODO: b/296444923 - Resolve pandas dependency another way
@@ -481,7 +481,7 @@ RUN pip install bleach \
         webencodings \
         widgetsnbextension \
         # Require pyarrow newer than https://github.com/advisories/GHSA-5wvp-7f3h-6wmm
-        "pyarrow>=14.0.1" \
+        {{ if eq .Accelerator "gpu" }} pyarrow {{ else }} "pyarrow>=14.0.1" {{ end }} \
         feather-format \
         fastai