Merge remote-tracking branch 'origin/main'

Dockerfile

@@ -1,4 +1,4 @@
-FROM tyrannas/panoptic-clip-base:latest
+FROM ceressorbonne/panoptic-clip-base:latest
 
 COPY . /app 
 WORKDIR ./app/panoptic_back/ 
@@ -12,6 +12,7 @@ RUN chown -R 1000:1000 /data/
 RUN chmod -R 777 /data/
 
 ENV PANOPTIC_HOST="0.0.0.0"
+ENV IS_DOCKER="True"
 
 EXPOSE 8000
 

Dockerfile-base.dockerfile

@@ -1,5 +1,7 @@
-FROM python:3
+FROM python:3.12.2-bullseye
 
+RUN pip3 install -U pip
+RUN pip3 install MarkupSafe
 RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
 RUN pip3 install --force-reinstall transformers typing-extensions
 

panoptic_back/panoptic/utils.py

@@ -22,8 +22,9 @@ def get_datadir() -> pathlib.Path:
     """
 
     home = pathlib.Path.home()
-
-    if sys.platform == "win32":
+    if os.getenv('IS_DOCKER', False):
+        return pathlib.Path('/data')
+    elif sys.platform == "win32":
         return home / "AppData/Roaming"
     elif sys.platform == "linux":
         return home / ".local/share"