From 33b72a5dc2a1b1da985c2071174cc08771a60f8b Mon Sep 17 00:00:00 2001
From: Ray Douglass <3107146+raydouglass@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:50:11 -0500
Subject: [PATCH 1/2] Update dask-sql to 2023.11.0 (#617)

Closes #607
Closes #614

RAPIDS `23.12` uses `dask` `2023.11.0` (https://github.com/rapidsai/rapids-dask-dependency/pull/6), so need to update `dask-sql` to match (https://github.com/conda-forge/dask-sql-feedstock/pull/78).

This should resolve the conflicts seen here: https://github.com/rapidsai/docker/actions/runs/7130639487/job/19419248901#step:9:235

Authors:
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Bradley Dice (https://github.com/bdice)

URL: https://github.com/rapidsai/docker/pull/617
---
 Dockerfile  | 2 +-
 matrix.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 54635f4a..78198f77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG PYTHON_VER=3.10
 ARG LINUX_VER=ubuntu22.04
 
 ARG RAPIDS_VER=23.12
-ARG DASK_SQL_VER=2023.10.0
+ARG DASK_SQL_VER=2023.11.0
 
 # Gather dependency information
 FROM rapidsai/ci-conda:latest AS dependencies
diff --git a/matrix.yaml b/matrix.yaml
index 10f3977b..140a7c16 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -6,4 +6,4 @@ PYTHON_VER:
   - "3.9"
   - "3.10"
 DASK_SQL_VER:
-  - "2023.10.0"
+  - "2023.11.0"

From f986ac64ce3fb600f980257f160a54c449286ccb Mon Sep 17 00:00:00 2001
From: Ray Douglass <3107146+raydouglass@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:03:23 -0500
Subject: [PATCH 2/2] Add SHELL instruction for every stage (#618)

Replaces #616

Adds the `SHELL` instruction to every stage in each Dockerfile.

This ensures an error in any `RUN` will fail the build. Such as https://github.com/rapidsai/docker/actions/runs/7130639487/job/19419248901#step:9:235

Authors:
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: https://github.com/rapidsai/docker/pull/618
---
 Dockerfile                    | 4 ++++
 raft-ann-bench/cpu/Dockerfile | 2 ++
 raft-ann-bench/gpu/Dockerfile | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 78198f77..1a9c23f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,8 @@ ARG PYTHON_VER
 ARG RAPIDS_VER
 ARG DASK_SQL_VER
 
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 RUN useradd -rm -d /home/rapids -s /bin/bash -g conda -u 1001 rapids
 
 USER rapids
@@ -63,6 +65,8 @@ CMD ["ipython"]
 # Notebooks image
 FROM base as notebooks
 
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 USER rapids
 
 WORKDIR /home/rapids
diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile
index 705fdcbc..3e1f734e 100644
--- a/raft-ann-bench/cpu/Dockerfile
+++ b/raft-ann-bench/cpu/Dockerfile
@@ -49,6 +49,8 @@ ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]
 
 FROM bench-base as raft-ann-bench-cpu-datasets
 
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 COPY raft-ann-bench/get_datasets.sh /home/rapids/raftannbench/get_datasets.sh
 
 COPY raft-ann-bench/run_benchmark.sh /data/scripts/run_benchmark_preloaded_datasets.sh
diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile
index 4083b959..abf99138 100644
--- a/raft-ann-bench/gpu/Dockerfile
+++ b/raft-ann-bench/gpu/Dockerfile
@@ -52,6 +52,8 @@ ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]
 
 FROM raft-ann-bench as raft-ann-bench-datasets
 
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 COPY raft-ann-bench/get_datasets.sh /home/rapids/raftannbench/get_datasets.sh
 
 COPY raft-ann-bench/run_benchmarks_preloaded_datasets.sh /data/scripts/run_benchmarks_preloaded_datasets.sh