Merge pull request #1 from logasja/newdockerfile

.dockerignore

@@ -1,2 +1,3 @@
 /venv
 /flagged
+/.env

Dockerfile

@@ -1,18 +1,33 @@
-FROM continuumio/miniconda3
-EXPOSE 7860
+FROM python:3.7-slim as builder
+
+RUN apt update && \
+    apt install --no-install-recommends -y build-essential gcc
+COPY requirements_personal.txt /req.txt
+
+RUN python -m pip install --upgrade pip && \
+    pip install --no-cache-dir --no-warn-script-location --user -r req.txt && \
+    pip install --no-cache-dir --no-warn-script-location --user typing-extensions -U
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libgl1-mesa-glx && \
-    apt-get install -y --no-install-recommends libglib2.0-0 && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+# Stage 2: Runtime
+FROM nvidia/cuda:11.0.3-cudnn8-runtime
 
-ENV GRADIO_SERVER_NAME=0.0.0.0
-WORKDIR /workspace
+RUN rm /etc/apt/sources.list.d/cuda.list
+RUN rm /etc/apt/sources.list.d/nvidia-ml.list
 
-ADD environment.yaml /workspace/environment.yaml
-RUN conda env update -n base --file environment.yaml && \
-    pip install typing-extensions -U
+ENV TZ=America/New_York
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ADD app.py /workspace/
-CMD [ "python" , "/workspace/app.py" ]
+RUN apt update && \
+    apt install --no-install-recommends -y build-essential software-properties-common libgl1-mesa-glx && \
+    add-apt-repository -y ppa:deadsnakes/ppa && \
+    apt install --no-install-recommends -y python3.7 python3.7-distutils && \
+    # update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 && \
+    update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 2 && \
+    apt clean && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /root/.local/lib/python3.7/site-packages /usr/local/lib/python3.7/dist-packages
+COPY app.py app.py
+
+# RUN ln -s /usr/local/cuda/lib64/libcusolver.so.11 /usr/local/cuda/lib64/libcusolver.so.10
+
+CMD ["python3", "app.py"]
+EXPOSE 7860

Dockerfile.bkup

@@ -0,0 +1,18 @@
+FROM continuumio/miniconda3
+EXPOSE 7860
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends libgl1-mesa-glx && \
+    apt-get install -y --no-install-recommends libglib2.0-0 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV GRADIO_SERVER_NAME=0.0.0.0
+WORKDIR /workspace
+
+ADD environment.yaml /workspace/environment.yaml
+RUN conda env update -n base --file environment.yaml && \
+    pip install typing-extensions -U
+
+ADD app.py /workspace/
+CMD [ "python" , "/workspace/app.py" ]

app.py

@@ -1,14 +1,15 @@
 from fawkes.protection import Fawkes
 import gradio as gr
+import os
 
 def predict(level, img):
   # print(img)
   fwks = Fawkes("extractor_2", '0', 1, mode=level)
   fwks.run_protection([img], format='jpeg')
   splt = img.split(".")
-  # print(os.listdir('/tmp'))
-  return splt[0] + "_cloaked." + splt[1]
+  print(os.listdir('/tmp'))
+  return splt[0] + "_cloaked.jpeg"
 
 gr.Interface(fn=predict, inputs=[gr.components.Dropdown(["low", "mid", "high"], label="Protection Level"),
                                  gr.components.Image(type='filepath')],
-                                 outputs=gr.components.Image(type="pil")).launch(show_error=True)
+                                 outputs=gr.components.Image(type="pil")).launch(show_error=True, server_name="0.0.0.0")

requirements_personal.txt

@@ -1,2 +1,2 @@
-gradio==3.0.20
+gradio==3.14.0
 fawkes==1.0.4