From 26ef6d906193f8a54b8fc98e600252ba0762e513 Mon Sep 17 00:00:00 2001
From: LEv145 <you@example.com>
Date: Mon, 27 Mar 2023 16:39:58 +0200
Subject: [PATCH] Update docker

Add path for docker
Add Dockerfile for AMD
---
 .../docker-compose.yml                        | 28 ++++++++++++++-----
 docker/docker_files/amd.Dockerfile            | 17 +++++++++++
 .../docker_files/default.Dockerfile           |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (70%)
 create mode 100644 docker/docker_files/amd.Dockerfile
 rename Dockerfile => docker/docker_files/default.Dockerfile (92%)

diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 70%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 42cc4f1a4..170838ad0 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,7 +3,9 @@ version: "3.9"
 
 x-base_service: &base_service
   image: comfyui:1
-  build: .
+  build:
+    context: docker_files
+    dockerfile: default.Dockerfile
 
   environment:
     - CLI_ARGS=--listen --port 8188
@@ -11,10 +13,11 @@ x-base_service: &base_service
   ports:
     - "8188:8188"
   volumes:
-    - ./models:/opt/comfy_ui/models
-    - ./output:/opt/comfy_ui/output
-    - ./input:/opt/comfy_ui/input
-    - ./custom_nodes:/opt/comfy_ui/custom_nodes
+    - models:/opt/comfy_ui/models
+    - output:/opt/comfy_ui/output
+    - input:/opt/comfy_ui/input
+    - custom_nodes:/opt/comfy_ui/custom_nodes
+  restart: unless-stopped
 
 x-nvidia_docker: &nvidia_docker
   deploy:
@@ -26,6 +29,10 @@ x-nvidia_docker: &nvidia_docker
             capabilities: [gpu]
 
 x-base_service_amd: &amd_docker
+  build:
+    context: docker_files
+    dockerfile: amd.Dockerfile
+
   group_add:
     - video
   devices:
@@ -43,12 +50,12 @@ services:
     <<: *base_service
     <<: *amd_docker
     profiles: ["amd"]
-    
+
   amd6600:
     <<: *base_service
     <<: *amd_docker
     profiles: ["amd6600"]
-  
+
     environment:
       - HSA_OVERRIDE_GFX_VERSION=10.3.0
       - CLI_ARGS=--listen --port 8188
@@ -58,3 +65,10 @@ services:
     profiles: ["cpu"]
     environment:
       - CLI_ARGS=--listen --port 8188 --cpu
+
+
+volumes:
+  models:
+  output:
+  input:
+  custom_nodes:
diff --git a/docker/docker_files/amd.Dockerfile b/docker/docker_files/amd.Dockerfile
new file mode 100644
index 000000000..82b8ac543
--- /dev/null
+++ b/docker/docker_files/amd.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.10-slim
+
+
+WORKDIR /opt/comfy_ui
+
+
+RUN PIP_NO_CACHE_DIR=1 pip install --extra-index-url https://download.pytorch.org/whl/rocm5.4.2 \
+torch \
+torchvision \
+torchaudio
+
+COPY ../.. /opt/comfy_ui
+RUN pip install -r requirements.txt
+
+
+ENV CLI_ARGS=""
+CMD python main.py ${CLI_ARGS}
diff --git a/Dockerfile b/docker/docker_files/default.Dockerfile
similarity index 92%
rename from Dockerfile
rename to docker/docker_files/default.Dockerfile
index 03dd3a855..c9228b15d 100644
--- a/Dockerfile
+++ b/docker/docker_files/default.Dockerfile
@@ -11,7 +11,7 @@ torchaudio \
 xformers \
 triton
 
-COPY . /opt/comfy_ui
+COPY ../.. /opt/comfy_ui
 RUN pip install -r requirements.txt