From c723b60ed9be2a77ac0270b947c09bd43efd5897 Mon Sep 17 00:00:00 2001
From: vincent-czi <89553795+vincent-czi@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:02:49 -0700
Subject: [PATCH] Update nextstrain docker image for better mpox-ing (#1704)

---
 src/backend/Dockerfile.nextstrain | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/backend/Dockerfile.nextstrain b/src/backend/Dockerfile.nextstrain
index 90e1bf9d0..d0f0e136b 100644
--- a/src/backend/Dockerfile.nextstrain
+++ b/src/backend/Dockerfile.nextstrain
@@ -1,7 +1,8 @@
 ## Dockerfile for aspen batch jobs
 ##
-##
-FROM nextstrain/base:build-20221207T221900Z
+## Using most recent docker image from nextstrain's base image as of Aug 26,
+## 2024 as we do work to update tree building to work correctly for mpox.
+FROM nextstrain/base:build-20240822T213558Z
 ARG DEBIAN_FRONTEND=noninteractive
 
 LABEL maintainer = "CZ Gen Epi"
@@ -44,14 +45,17 @@ ENV FLASK_ENV=development
 RUN pip3 install nextstrain-cli csv-diff s3fs[boto3] aiobotocore[awscli,boto3] envdir fsspec pandas
 RUN pip3 uninstall -y pangoLEARN
 
+# Using most recent commit from nextstrain's ncov as of Aug 26, 2024 as we do work
+# to update tree building to work correctly for mpox.
 RUN mkdir /ncov && \
     cd /ncov && \
     git init && \
-    git remote add origin https://github.com/chanzuckerberg/ncov.git && \
-    git fetch origin czgenepi && \
-    git reset --hard FETCH_HEAD
+    git remote add origin https://github.com/nextstrain/ncov.git && \
+    git fetch origin master && \
+    git reset --hard e42576751a3e89a36d260aff70f9f6bbc62a9d32
 
 # Add support for our custom mpox workflow
+# TODO [Vincent & Dan; Aug 2024]: Update the `mpox` workflow content.
 RUN mkdir /mpox && \
     cd /mpox && \
     git init && \