From 63b1cbd47d7550237b5eb6c31b22d8819b8584bf Mon Sep 17 00:00:00 2001
From: Krithika Sundararajan <krithika.sundararajan@gojek.com>
Date: Thu, 30 Nov 2023 08:50:09 +0800
Subject: [PATCH] Put back the sed replacement command for merlin-sdk

---
 python/batch-predictor/docker/app.Dockerfile | 1 +
 python/pyfunc-server/docker/Dockerfile       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/python/batch-predictor/docker/app.Dockerfile b/python/batch-predictor/docker/app.Dockerfile
index 2d1002e0f..3fd01a3dd 100644
--- a/python/batch-predictor/docker/app.Dockerfile
+++ b/python/batch-predictor/docker/app.Dockerfile
@@ -25,6 +25,7 @@ RUN if [[ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then gcloud auth activate-s
 RUN gsutil -m cp -r ${MODEL_URL} .
 RUN /bin/bash -c ". activate ${CONDA_ENVIRONMENT} && \
     sed -i 's/mlflow[><=]\{0,1\}.*$/mlflow==1.26.1/g' ${HOME}/model/conda.yaml && \
+    sed -i '/merlin-sdk/d' ${HOME}/model/conda.yaml && \
     conda env update --name ${CONDA_ENVIRONMENT} --file ${HOME}/model/conda.yaml && \
     pip install ${SDK_PATH} && \
     python ${HOME}/merlin-spark-app/main.py --dry-run-model ${HOME}/model"
diff --git a/python/pyfunc-server/docker/Dockerfile b/python/pyfunc-server/docker/Dockerfile
index bde7e32d7..51babf2b5 100644
--- a/python/pyfunc-server/docker/Dockerfile
+++ b/python/pyfunc-server/docker/Dockerfile
@@ -25,6 +25,7 @@ RUN if [ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]; then gcloud auth activate-ser
 RUN gsutil cp -r ${MODEL_URL} .
 RUN /bin/bash -c ". activate merlin-model && \
     sed -i 's/mlflow[><=]\{0,1\}.*$/mlflow==1.26.1/g' model/conda.yaml && \
+    sed -i '/merlin-sdk/d' model/conda.yaml && \
     conda env update --name merlin-model --file model/conda.yaml && \
     pip install ${SDK_PATH} && \
     python -m pyfuncserver --model_dir model --dry_run"