From c2e4550da9542c0f0765e4e88b73bdb1aaa3f666 Mon Sep 17 00:00:00 2001
From: Zach Lipp <zlipp@protonmail.com>
Date: Wed, 18 Sep 2024 12:40:33 -0400
Subject: [PATCH] Fix dockerfile and docs (#7)

* fix cruft from bad git merge

* update todo list
---
 Dockerfile | 6 ------
 README.md  | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dab6172..7a95dee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,10 +55,4 @@ RUN python3 -m venv .venv && \
     # TODO: Parametrize?
     pip install -r neurovolume_deps.txt
 
-<<<<<<< multi-stage-build
-ENTRYPOINT ["sleep", "infinity"]
-=======
-ENV PYTHONPATH="/openvdb/build/openvdb/openvdb/python"
-
 ENTRYPOINT [ "sleep", "infinity" ]
->>>>>>> main
diff --git a/README.md b/README.md
index 979735f..17607e0 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,11 @@ To do so using [act](https://github.com/nektos/act):
 - navigate to `openvdb_docker`
 - run `act -j build`
 
-
 # To Do
 ## Dev and Build
 - [ ] Configure the Dev Container with Python
 - [ ] Learn how to not copy Dev Container directories
-- [ ] Multistage Build
+- [x] Multistage Build
 - [ ] Docker Compose File for developer experience
 - [ ] Install VScode Python extension
 - [ ] Install Jupyter Python extension