From e970a848981ef7abc7f19e9ba4d010e898c87fbb Mon Sep 17 00:00:00 2001
From: ct00659um <ct00659@surrey.ac.uk>
Date: Thu, 2 Nov 2023 16:02:39 +0000
Subject: [PATCH] attempting t resolve conflict

---
 Dockerfile          | 1 +
 segmentAnything.yml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d16f1d4..d143a3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,3 +49,4 @@ RUN conda install -c conda-forge python=3.9
 RUN conda env update --file segmentAnything.yml --prune && conda clean -y --all
 
 RUN conda install pytorch torchvision torchaudio pytorch-cuda=11.7 -c pytorch -c nvidia
+RUN pip3 install ffmpeg
diff --git a/segmentAnything.yml b/segmentAnything.yml
index aa879a2..32a3dcb 100644
--- a/segmentAnything.yml
+++ b/segmentAnything.yml
@@ -39,7 +39,6 @@ dependencies:
   - entrypoints=0.4=py311h06a4308_0
   - executing=0.8.3=pyhd3eb1b0_0
   - expat=2.4.9=h6a678d5_0
-  - ffmpeg=4.3=hf484d3e_0
   - filelock=3.9.0=py311h06a4308_0
   - fontconfig=2.14.1=h4c34cd2_2
   - freetype=2.12.1=h4a9f257_0
-- 
GitLab