From f8165a3f9f08568cafe663f518f031eadfa29e40 Mon Sep 17 00:00:00 2001
From: BrianMichell <brianm314@comcast.net>
Date: Tue, 22 Oct 2024 13:45:23 +0000
Subject: [PATCH 1/2] Pin cpplint to version 1.6.1

---
 .devcontainer/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ded9803..019e775 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,6 +16,7 @@ ARG POETRY_VERSION=1.2.2
 ARG CMAKE_MAJOR=3.24
 ARG CMAKE_VERSION=3.24.2
 ARG HYPERFINE=1.15.0
+ARG CPPLINT_VERSION=1.6.1
 
 # avoid a torch.distributed error
 # TODO: figure out optimal value
@@ -66,7 +67,7 @@ ENV PATH="/venv/bin:$PATH"
 # FIXME - pip is out of date, find a better way
 RUN pip install --upgrade pip
 
-RUN pip install wheel yapf cpplint zarr xarray
+RUN pip install wheel yapf cpplint==${CPPLINT_VERSION} zarr xarray
 
 RUN pip install \
   "poetry==$POETRY_VERSION" \

From a8a55982426072e5e96dcf0be4bb8316fd4f3187 Mon Sep 17 00:00:00 2001
From: BrianMichell <brianm314@comcast.net>
Date: Tue, 22 Oct 2024 13:53:03 +0000
Subject: [PATCH 2/2] Fix Dockerfile: Remove unnecessary environment variable
 and update pip

---
 .devcontainer/Dockerfile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 019e775..a25e03e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -18,10 +18,6 @@ ARG CMAKE_VERSION=3.24.2
 ARG HYPERFINE=1.15.0
 ARG CPPLINT_VERSION=1.6.1
 
-# avoid a torch.distributed error
-# TODO: figure out optimal value
-ENV OMP_NUM_THREADS=1
-
 # C++/build dependencies
 RUN apt update \
   && apt install -y \
@@ -64,9 +60,6 @@ RUN mkdir -p /venv
 RUN python3.10 -m venv /venv
 ENV PATH="/venv/bin:$PATH"
 
-# FIXME - pip is out of date, find a better way
-RUN pip install --upgrade pip
-
 RUN pip install wheel yapf cpplint==${CPPLINT_VERSION} zarr xarray
 
 RUN pip install \